From 481d1640b6c73a36123fe87ad81c42fbdbbd91d0 Mon Sep 17 00:00:00 2001 From: Hugh Dickins Date: Fri, 10 Mar 2006 21:13:44 +0000 Subject: [PATCH] --- yaml --- r: 20965 b: refs/heads/master c: 4ceadbf519c6820b236a9a213255260eb825974b h: refs/heads/master i: 20963: 17dde045117f661a83c09b4f74ffeb405b969e66 v: v3 --- [refs] | 2 +- trunk/drivers/pcmcia/ds.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 22f153807f24..888b68428947 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8fce4d8e3b9e3cf47cc8afeb6077e22ab795d989 +refs/heads/master: 4ceadbf519c6820b236a9a213255260eb825974b diff --git a/trunk/drivers/pcmcia/ds.c b/trunk/drivers/pcmcia/ds.c index 54ad93daca3c..bb96ce1db08c 100644 --- a/trunk/drivers/pcmcia/ds.c +++ b/trunk/drivers/pcmcia/ds.c @@ -411,7 +411,7 @@ static int pcmcia_device_probe(struct device * dev) * 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);