[PATCH] Make cardbus device_register work

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.

diff --git a/drivers/pcmcia/cardbus.c b/drivers/pcmcia/cardbus.c
index 7001c37d167c6f80c5c3e025f9a2841476f659bd..580c9d93b64b22c8fd503302c2cf84392d25df45 100644 (file)
--- a/drivers/pcmcia/cardbus.c
+++ b/drivers/pcmcia/cardbus.c
@@ -279,13 +279,13 @@ int cb_alloc(socket_info_t * s)
                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;