Commit b2f51a1c authored by Hugh Dickins's avatar Hugh Dickins Committed by Dominik Brodowski
Browse files

[PATCH] pcmcia: fix pcmcia_device_remove oops 



Fix pcmcia_device_remove NULL pointer dereference at shutdown.

Signed-off-by: default avatarHugh Dickins <hugh@veritas.com>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 30bac7aa

drivers/pcmcia/ds.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -464,7 +464,7 @@ static int pcmcia_device_remove(struct device * dev) 
	 * all devices

	 * all devices

	 */

	 */

	did = (struct pcmcia_device_id *) p_dev->dev.driver_data;

	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->socket->device_count != 0) &&

	    (p_dev->device_no == 0))

	    (p_dev->device_no == 0))

		pcmcia_card_remove(p_dev->socket, p_dev);

		pcmcia_card_remove(p_dev->socket, p_dev);