Re: [bk patch] Make cardbus compile in -pre4

From: Peter Osterlund (petero2@telia.com)
Date: Sat Feb 09 2002 - 06:44:51 EST

Patrick Mochel <mochel@osdl.org> writes:

> I broke cardbus compile in -pre4 on accident. Sorry about that...

It compiles in -pre5 but doesn't work unless you also apply the patch
below. Without this patch, bus_id will be empty which makes
device_register fail.

--- linux/drivers/pcmcia/cardbus.c.old Sat Feb 9 12:39:49 2002
+++ linux/drivers/pcmcia/cardbus.c Sat Feb 9 12:14:36 2002
@@ -279,13 +279,13 @@
                 pci_readw(dev, PCI_DEVICE_ID, &dev->device);
                 dev->hdr_type = hdr & 0x7f;
 
+ pci_setup_device(dev);
+
                 dev->dev.parent = bus->dev;
                 strcpy(dev->dev.name, dev->name);
                 strcpy(dev->dev.bus_id, dev->slot_name);
                 device_register(&dev->dev);
 
- pci_setup_device(dev);
-
                 /* FIXME: Do we need to enable the expansion ROM? */
                 for (r = 0; r < 7; r++) {
                         struct resource *res = dev->resource + r; 

-- 
Peter Osterlund - petero2@telia.com
http://w1.894.telia.com/~u89404340
-
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 : Fri Feb 15 2002 - 21:00:26 EST