[PATCH 32/33] pcmcia: fix pcmcia_device_remove oops

[Dominik Brodowski]

From: Hugh Dickins <hugh at veritas.com>

Fix pcmcia_device_remove NULL pointer dereference at shutdown.

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

---

 drivers/pcmcia/ds.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

b2f51a1cb4e1d72061d7a3f7905affdb7d074fec
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 8966dd0..ae10d1e 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -464,7 +464,7 @@ static int pcmcia_device_remove(struct d
 	 * 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);
-- 
1.2.4