Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / hid / hid-prodikeys.c

diff --git a/drivers/hid/hid-prodikeys.c b/drivers/hid/hid-prodikeys.c
index 158b389..f779009 100644 (file)
--- 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;
 }