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

Commit b2f51a1c authored Mar 10, 2006 by Hugh Dickins Committed by Dominik Brodowski Mar 31, 2006

[PATCH] pcmcia: fix pcmcia_device_remove oops



Fix pcmcia_device_remove NULL pointer dereference at shutdown.

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

parent 30bac7aa

drivers/pcmcia/ds.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -464,7 +464,7 @@ static int pcmcia_device_remove(struct device * dev)
		* all devices
		*/
		did = (struct pcmcia_device_id *) p_dev->dev.driver_data;
		if ((did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) &&
		if (did && (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) &&
		(p_dev->socket->device_count != 0) &&
		(p_dev->device_no == 0))
		pcmcia_card_remove(p_dev->socket, p_dev);