Merge bk://bk.arm.linux.org.uk/linux-2.5-pcmcia

into home.transmeta.com:/home/torvalds/v2.5/linux

Merge bk://bk.arm.linux.org.uk/linux-2.5-pcmcia
into home.transmeta.com:/home/torvalds/v2.5/linux
15e1406e · Linus Torvalds · e9ef38e1 · b4877f58 · 15e1406e
Commit 15e1406e authored Apr 17, 2003 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

drivers/pcmcia/cardbus.c drivers/pcmcia/cardbus.c +2 -1

No files found.
--- a/drivers/pcmcia/cardbus.c
+++ b/drivers/pcmcia/cardbus.c
@@ -270,5 +270,6 @@ void cb_free(socket_info_t * s)
 {
 	struct pci_dev *bridge = s->cap.cb_dev;

-	pci_remove_behind_bridge(bridge);
+	if (bridge)
+		pci_remove_behind_bridge(bridge);
 }