[PATCH] cardbus: switch to ref counting/hotplug safe API
Signed-off-by: Alan Cox <alan@redhat.com> Cc: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
df10f4edd5
commit
74ae322181
1 changed files with 4 additions and 1 deletions
|
@ -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);
|
||||
|
||||
dev = pci_find_slot(s->cb_dev->subordinate->number, 0);
|
||||
dev = pci_get_slot(s->cb_dev->subordinate, 0);
|
||||
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;
|
||||
|
||||
pci_dev_put(dev);
|
||||
|
||||
if (!res->flags)
|
||||
goto fail;
|
||||
|
||||
|
|
Loading…
Reference in a new issue