On Thu, 4 Aug 2011, Bojan Prtvar wrote:
> 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@xxxxxxx>
> Signed-off-by: Bojan Prtvar <prtvar.b@xxxxxxxxx>
> ---
> 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;
> }
>
Applied, thanks to both.
--
Jiri Kosina
SUSE Labs
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
