1 files changed, 3 insertions, 6 deletions

diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index 87fbe2924cfa..30dbb6b40bbf 100644
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@ -624,7 +624,7 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
         struct sony_sc *sc;
         unsigned int connect_mask = HID_CONNECT_DEFAULT;
 
-        sc = kzalloc(sizeof(*sc), GFP_KERNEL);
+        sc = devm_kzalloc(&hdev->dev, sizeof(*sc), GFP_KERNEL);
         if (sc == NULL) {
                 hid_err(hdev, "can't alloc sony descriptor\n");
                 return -ENOMEM;
@@ -636,7 +636,7 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
         ret = hid_parse(hdev);
         if (ret) {
                 hid_err(hdev, "parse failed\n");
-                goto err_free;
+                return ret;
         }
 
         if (sc->quirks & VAIO_RDESC_CONSTANT)
@@ -649,7 +649,7 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
         ret = hid_hw_start(hdev, connect_mask);
         if (ret) {
                 hid_err(hdev, "hw start failed\n");
-                goto err_free;
+                return ret;
         }
 
         if (sc->quirks & SIXAXIS_CONTROLLER_USB) {
@@ -669,8 +669,6 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
         return 0;
 err_stop:
         hid_hw_stop(hdev);
-err_free:
-        kfree(sc);
         return ret;
 }
 
@@ -682,7 +680,6 @@ static void sony_remove(struct hid_device *hdev)
                 buzz_remove(hdev);
 
         hid_hw_stop(hdev);
-        kfree(sc);
 }
 
 static const struct hid_device_id sony_devices[] = {