Commit dfbc9e9d authored Nov 18, 2006 by Daniel Ritz Committed by Linus Torvalds Nov 20, 2006

[PATCH] pcmcia: fix 'rmmod pcmcia' with unbound devices



Having unbound PCMCIA devices: doing a 'find /sys' after a 'rmmod pcmcia'
gives an oops because the pcmcia_device is not unregisterd from the driver
core.

fixes bugzilla #7481

Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>
Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Pavol Gono <Palo.Gono@gmail.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 610a5b74

drivers/pcmcia/ds.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1271,6 +1271,9 @@ static void pcmcia_bus_remove_socket(struct class_device *class_dev,
	socket->pcmcia_state.dead = 1;		socket->pcmcia_state.dead = 1;
	pccard_register_pcmcia(socket, NULL);		pccard_register_pcmcia(socket, NULL);

			/* unregister any unbound devices */
			pcmcia_card_remove(socket, NULL);

	pcmcia_put_socket(socket);		pcmcia_put_socket(socket);

	return;		return;