[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1312494408-15500-1-git-send-email-prtvar.b@gmail.com>
Date: Thu, 4 Aug 2011 23:46:48 +0200
From: Bojan Prtvar <prtvar.b@...il.com>
To: jkosina@...e.cz, julia@...u.dk
Cc: linux-input@...r.kernel.org, linux-kernel@...r.kernel.org,
kernel-janitors@...r.kernel.org, Bojan Prtvar <prtvar.b@...il.com>
Subject: [PATCH 1/2 v2] HID: kfree() NULL pointer cleanup
Checking for NULL pointers before kfree() is redundant.
v2:
No need for freeing pm in case when it's not allocated.
Reported-by: Julia Lawall <julia@...u.dk>
Signed-off-by: Bojan Prtvar <prtvar.b@...il.com>
---
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 158b389..f779009 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;
}
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists