From 1eb1c5bc0ea3b03e03d074c452592a3f38bd1f2a Mon Sep 17 00:00:00 2001 From: Bart Massey Date: Mon, 21 Sep 2009 11:38:07 -0700 Subject: [PATCH] --- yaml --- r: 175065 b: refs/heads/master c: 92c4bad75cef701af881c8caffa1b02f7891a295 h: refs/heads/master i: 175063: 0eae0a216f92a607f83f2fa60e9cf7d3949c1a15 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e0972e565b68..d58ca4f512b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 962331810fffda3e9ee474fbd9d748ee32ecc1f6 +refs/heads/master: 92c4bad75cef701af881c8caffa1b02f7891a295 diff --git a/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c b/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c index bf6ce0284af3..300ecb2ac9ec 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c +++ b/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c @@ -272,9 +272,8 @@ static void labpc_cs_detach(struct pcmcia_device *link) labpc_release(link); } - /* This points to the parent local_info_t struct */ - if (link->priv) - kfree(link->priv); + /* This points to the parent local_info_t struct (may be null) */ + kfree(link->priv); } /* labpc_cs_detach */