summaryrefslogtreecommitdiff
path: root/drivers/hid/hid-prodikeys.c
diff options
context:
space:
mode:
authorBojan Prtvar <prtvar.b@gmail.com>2011-08-05 01:46:48 +0400
committerJiri Kosina <jkosina@suse.cz>2011-08-05 01:51:29 +0400
commit00b15628b0aa73199f74bd6c988b8d2b55f51190 (patch)
tree3653775b8ba5dbdf9ce150e8bc7c98b10ae037ac /drivers/hid/hid-prodikeys.c
parent6371fe54b500f1f31033e0035a061fa320171930 (diff)
downloadlinux-00b15628b0aa73199f74bd6c988b8d2b55f51190.tar.xz
HID: prodikeys: kfree() NULL pointer cleanup
No need for freeing pm in case when it's not allocated. Reported-by: Julia Lawall <julia@diku.dk> Signed-off-by: Bojan Prtvar <prtvar.b@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-prodikeys.c')
-rw-r--r--drivers/hid/hid-prodikeys.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/hid/hid-prodikeys.c b/drivers/hid/hid-prodikeys.c
index 158b389d0fb7..f779009104eb 100644
--- a/drivers/hid/hid-prodikeys.c
+++ b/drivers/hid/hid-prodikeys.c
@@ -816,7 +816,7 @@ static int pk_probe(struct hid_device *hdev, const struct hid_device_id *id)
if (pm == NULL) {
hid_err(hdev, "can't alloc descriptor\n");
ret = -ENOMEM;
- goto err_free;
+ goto err_free_pk;
}
pm->pk = pk;
@@ -849,10 +849,10 @@ static int pk_probe(struct hid_device *hdev, const struct hid_device_id *id)
err_stop:
hid_hw_stop(hdev);
err_free:
- if (pm != NULL)
- kfree(pm);
-
+ kfree(pm);
+err_free_pk:
kfree(pk);
+
return ret;
}