commit 4ceadbf519c6820b236a9a213255260eb825974b
author Hugh Dickins <hugh@veritas.com> Fri Mar 10 21:13:44 2006 +0000
committer Linus Torvalds <torvalds@g5.osdl.org> Fri Mar 10 13:40:26 2006 -0800
tree 41258b7a6572fe0823695842296519baa51cc766
parent 8fce4d8e3b9e3cf47cc8afeb6077e22ab795d989

[PATCH] fix pcmcia_device_probe oops

Fix pcmcia_device_probe NULL pointer dereference at startup.

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

drivers/pcmcia/ds.c

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 54ad93d..bb96ce1 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -411,7 +411,7 @@
 	 * pseudo devices, and if not, add the second one.
 	 */
 	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 == 1) && (p_dev->device_no == 0))
 		pcmcia_add_pseudo_device(p_dev->socket);