fix pcmcia_device_probe oops
PATCH 1/1 fix pcmcia_device_probe oops
Fix pcmcia_device_probe NULL pointer dereference at startup.
Signed-off-by Hugh Dickins <[email protected]>
---
This oops was in -mm for a long time, sorry, I never got around to investigating it then; but now it has graduated to mainline -rc5-git. It may well be a consequence of my ignoring pcmcia's "please expect breakage unless you upgrade to new tools" - but I think this is not a permissible kind of breakage, and my cards work as before with the fix.
drivers/pcmcia/ds.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-)
drivers/pcmcia/ds.c +1 -1
@@ -411,7 +411,7 @@ static int pcmcia_device_probe(struct de* 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);