Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Osterlund <petero2@telia.com>2002-02-09 04:20:19 -0800
committerDavid S. Miller <davem@redhat.com>2002-02-09 04:20:19 -0800
commit2226f84b1e9bce09a49c3466da17f74598abeb79 (patch)
treeb12159e0c79ed0b5c2783736f8044869163f14cb
parent0dc68d77428413d0f417df3a378f857a2e798ebf (diff)
[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.
-rw-r--r--drivers/pcmcia/cardbus.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/cardbus.c b/drivers/pcmcia/cardbus.c
index 7001c37d167c..580c9d93b64b 100644
--- 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;