Commit 15e1406e authored by Linus Torvalds's avatar Linus Torvalds

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

into home.transmeta.com:/home/torvalds/v2.5/linux
parents e9ef38e1 b4877f58
...@@ -270,5 +270,6 @@ void cb_free(socket_info_t * s) ...@@ -270,5 +270,6 @@ void cb_free(socket_info_t * s)
{ {
struct pci_dev *bridge = s->cap.cb_dev; struct pci_dev *bridge = s->cap.cb_dev;
pci_remove_behind_bridge(bridge); if (bridge)
pci_remove_behind_bridge(bridge);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment