From: Hugh Dickins Date: Fri, 10 Mar 2006 21:15:19 +0000 (+0000) Subject: [PATCH] pcmcia: fix pcmcia_device_remove oops X-Git-Tag: v2.6.17-rc1~14^2~1 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b2f51a1cb4e1d72061d7a3f7905affdb7d074fec;p=~emulex%2Finfiniband.git [PATCH] pcmcia: fix pcmcia_device_remove oops Fix pcmcia_device_remove NULL pointer dereference at shutdown. Signed-off-by: Hugh Dickins Signed-off-by: Dominik Brodowski --- diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c index 8966dd09139..ae10d1eed65 100644 --- a/drivers/pcmcia/ds.c +++ b/drivers/pcmcia/ds.c @@ -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);