summaryrefslogtreecommitdiff
path: root/drivers/staging/comedi
diff options
context:
space:
mode:
authorBart Massey <bart@cs.pdx.edu>2009-09-21 11:38:07 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-11 12:21:49 -0800
commit92c4bad75cef701af881c8caffa1b02f7891a295 (patch)
tree321110a31c5184e3acb87c77628005fd8dc7b2ce /drivers/staging/comedi
parent962331810fffda3e9ee474fbd9d748ee32ecc1f6 (diff)
Staging: comedi: ni_labpc_cs: removed null check from kfree
Signed-off-by: Bart Massey <bart@cs.pdx.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi')
-rw-r--r--drivers/staging/comedi/drivers/ni_labpc_cs.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c
index bf6ce0284af3..300ecb2ac9ec 100644
--- a/drivers/staging/comedi/drivers/ni_labpc_cs.c
+++ b/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 */