From ef93c5367503f48a3dd132d30ff42d21460c57d7 Mon Sep 17 00:00:00 2001 From: Bojan Prtvar Date: Thu, 4 Aug 2011 23:46:48 +0200 Subject: [PATCH] --- yaml --- r: 264769 b: refs/heads/master c: 00b15628b0aa73199f74bd6c988b8d2b55f51190 h: refs/heads/master i: 264767: 3fb005a545a81f5f783e0cdae5b5f3e859fa7ef5 v: v3 --- [refs] | 2 +- trunk/drivers/hid/hid-prodikeys.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e1981f9082d8..e1293dbf2c5d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6371fe54b500f1f31033e0035a061fa320171930 +refs/heads/master: 00b15628b0aa73199f74bd6c988b8d2b55f51190 diff --git a/trunk/drivers/hid/hid-prodikeys.c b/trunk/drivers/hid/hid-prodikeys.c index 158b389d0fb7..f779009104eb 100644 --- a/trunk/drivers/hid/hid-prodikeys.c +++ b/trunk/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; }