Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74ae3221 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

[PATCH] cardbus: switch to ref counting/hotplug safe API 



Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent df10f4ed

drivers/pcmcia/cardbus.c

+4 −1
Original line number Diff line number Diff line
@@ -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;