Skip to contentSkip to conversation

cardbus/hotplugging still broken in 2.5.56

PATCH Yaacov Akiba Slama 1 participant 1 message Jan 14, 2003 Pcmcia

lore
Share & tools
lore
#0 lore raw

Hello all !

I have a xircom (RBEM56G-100) lan+modem, and it seems that the following patch solves the problem of ressources collisions. Now, I can use 2.5.58mm1 in my laptop and I am happy.

Yaacov Akiba Slama

drivers/pcmcia/cardbus.c +4 -3
@@ -285,18 +285,19 @@
 		dev->dev.dma_mask = &dev->dma_mask;
 
 		pci_setup_device(dev);
-		if (pci_enable_device(dev))
-			continue;
 
 		strcpy(dev->dev.bus_id, dev->slot_name);
 
 		/* FIXME: Do we need to enable the expansion ROM? */
 		for (r = 0; r < 7; r++) {
 			struct resource *res = dev->resource + r;
-			if (res->flags)
+			if (!res->start && res->end)
 				pci_assign_resource(dev, r);
 		}
 
+		if (pci_enable_device(dev))
+			continue;
+
 		/* Does this function have an interrupt at all? */
 		pci_readb(dev, PCI_INTERRUPT_PIN, &irq_pin);
 		if (irq_pin) {