Re: Linux 2.5.44-ac3

[Greg KH <greg@kroah.com>]

On Fri, Oct 25, 2002 at 02:55:14PM +0200, Marco Roeland wrote:
> 
> > Linux 2.5.44-ac2
> > o	Rip out lots of the left over pcibios_ stuff	(Greg Kroah-Hartmann)
> 
> Since -ac2 there's a pcibios_read_config_dword left in drivers/pcmcia/cist.c
> preventing (CardBus) PCMCIA to compile.
> 
> The following makes it compile again, whether it _works_ I've absolutely no
> idea, lacking amongst others any kernel knowledge or even a cardbus card.
> Compiles for me (TM) ;-)

Here's a working patch (well, works for me (tm)) for this problem:

thanks,

greg k-h


diff -Nru a/drivers/pcmcia/cistpl.c b/drivers/pcmcia/cistpl.c
--- a/drivers/pcmcia/cistpl.c	Wed Oct 30 13:59:29 2002
+++ b/drivers/pcmcia/cistpl.c	Wed Oct 30 13:59:29 2002
@@ -429,7 +429,10 @@
 #ifdef CONFIG_CARDBUS
     if (s->state & SOCKET_CARDBUS) {
 	u_int ptr;
-	pcibios_read_config_dword(s->cap.cb_dev->subordinate->number, 0, 0x28, &ptr);
+	struct pci_dev *dev = pci_find_slot (s->cap.cb_dev->subordinate->number, 0);
+	if (!dev)
+	    return CS_BAD_HANDLE;
+	pci_read_config_dword(dev, 0x28, &ptr);
 	tuple->CISOffset = ptr & ~7;
 	SPACE(tuple->Flags) = (ptr & 7);
     } else