Re: [PATCH] pcibios removal changes for 2.5.48

From: Greg KH (greg@kroah.com)
Date: Wed Nov 20 2002 - 00:18:20 EST


ChangeSet 1.872.3.2, 2002/11/19 20:24:56-08:00, greg@kroah.com

PCMCIA: remove usage of pcibios_read_config_dword

diff -Nru a/drivers/pcmcia/cistpl.c b/drivers/pcmcia/cistpl.c
--- a/drivers/pcmcia/cistpl.c Tue Nov 19 21:06:55 2002
+++ b/drivers/pcmcia/cistpl.c Tue Nov 19 21:06:55 2002
@@ -430,7 +430,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
-
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/



This archive was generated by hypermail 2b29 : Sat Nov 23 2002 - 22:00:30 EST