diff options
author | Bojan Prtvar <prtvar.b@gmail.com> | 2011-08-04 17:46:48 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2011-08-04 17:51:29 -0400 |
commit | 00b15628b0aa73199f74bd6c988b8d2b55f51190 (patch) | |
tree | 3653775b8ba5dbdf9ce150e8bc7c98b10ae037ac /drivers/hid | |
parent | 6371fe54b500f1f31033e0035a061fa320171930 (diff) |
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')
-rw-r--r-- | drivers/hid/hid-prodikeys.c | 8 |
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) | |||
816 | if (pm == NULL) { | 816 | if (pm == NULL) { |
817 | hid_err(hdev, "can't alloc descriptor\n"); | 817 | hid_err(hdev, "can't alloc descriptor\n"); |
818 | ret = -ENOMEM; | 818 | ret = -ENOMEM; |
819 | goto err_free; | 819 | goto err_free_pk; |
820 | } | 820 | } |
821 | 821 | ||
822 | pm->pk = pk; | 822 | pm->pk = pk; |
@@ -849,10 +849,10 @@ static int pk_probe(struct hid_device *hdev, const struct hid_device_id *id) | |||
849 | err_stop: | 849 | err_stop: |
850 | hid_hw_stop(hdev); | 850 | hid_hw_stop(hdev); |
851 | err_free: | 851 | err_free: |
852 | if (pm != NULL) | 852 | kfree(pm); |
853 | kfree(pm); | 853 | err_free_pk: |
854 | |||
855 | kfree(pk); | 854 | kfree(pk); |
855 | |||
856 | return ret; | 856 | return ret; |
857 | } | 857 | } |
858 | 858 | ||