Re: [PATCH][2.5-AC] cistpl.c pcibios_read_config_dword

Russell King (rmk@arm.linux.org.uk)
Sun, 3 Nov 2002 17:59:10 +0000


On Sun, Nov 03, 2002 at 11:43:24AM -0500, Zwane Mwaikambo wrote:
> Sorry untested :/
>
> Index: linux-2.5.44-ac5/drivers/pcmcia/cistpl.c
> ===================================================================
> RCS file: /build/cvsroot/linux-2.5.44-ac5/drivers/pcmcia/cistpl.c,v
> retrieving revision 1.1.1.1
> diff -u -r1.1.1.1 cistpl.c
> --- linux-2.5.44-ac5/drivers/pcmcia/cistpl.c 3 Nov 2002 07:19:08 -0000 1.1.1.1
> +++ linux-2.5.44-ac5/drivers/pcmcia/cistpl.c 3 Nov 2002 16:32:36 -0000
> @@ -429,7 +429,7 @@
> #ifdef CONFIG_CARDBUS
> if (s->state & SOCKET_CARDBUS) {
> u_int ptr;
> - pcibios_read_config_dword(s->cap.cb_dev->subordinate->number, 0, 0x28, &ptr);
> + pci_read_config_dword(s->cap.cb_dev, PCI_CARDBUS_CIS, &ptr);
> tuple->CISOffset = ptr & ~7;
> SPACE(tuple->Flags) = (ptr & 7);
> } else

There is a patch that fixes this floating around. The above isn't correct,
because we don't want to read s->cap.cb_dev (which is the bridge), but we
want to read the cardbus device that was just plugged in.

-- 
Russell King (rmk@arm.linux.org.uk)                The developer of ARM Linux
             http://www.arm.linux.org.uk/personal/aboutme.html

- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/