git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
pcmcia
/
cardbus.c
diff --git
a/drivers/pcmcia/cardbus.c
b/drivers/pcmcia/cardbus.c
index
3f6d51d
..
2d7effe
100644
(file)
--- a/
drivers/pcmcia/cardbus.c
+++ b/
drivers/pcmcia/cardbus.c
@@
-138,7
+138,7
@@
int read_cb_mem(struct pcmcia_socket * s, int space, u_int addr, u_int len, void
cs_dbg(s, 3, "read_cb_mem(%d, %#x, %u)\n", space, addr, len);
cs_dbg(s, 3, "read_cb_mem(%d, %#x, %u)\n", space, addr, len);
- dev = pci_
find_slot(s->cb_dev->subordinate->number
, 0);
+ dev = pci_
get_slot(s->cb_dev->subordinate
, 0);
if (!dev)
goto fail;
if (!dev)
goto fail;
@@
-152,6
+152,9
@@
int read_cb_mem(struct pcmcia_socket * s, int space, u_int addr, u_int len, void
}
res = dev->resource + space - 1;
}
res = dev->resource + space - 1;
+
+ pci_dev_put(dev);
+
if (!res->flags)
goto fail;
if (!res->flags)
goto fail;