[PATCH AUTOSEL 4.18 103/136] HID: i2c-hid: Use devm to allocate i2c_hid struct

[Sasha Levin]

From: Stephen Boyd <swb...@chromium.org>

[ Upstream commit d6f83894110de247a81392ab7ef89e5498df7e80 ]

Use devm here to save some lines and prepare for bulk regulator usage in
this driver. Otherwise, when we devm bulk get regulators we'll free the
containing i2c_hid structure and try to put regulator pointers from
freed memory.

Cc: Benjamin Tissoires <benjamin.tissoi...@redhat.com>
Cc: Hans de Goede <hdego...@redhat.com>
Cc: Andy Shevchenko <andriy.shevche...@linux.intel.com>
Cc: Dmitry Torokhov <d...@chromium.org>
Cc: Doug Anderson <diand...@chromium.org>
Signed-off-by: Stephen Boyd <swb...@chromium.org>
Acked-by: Benjamin Tissoires <benjamin.tissoi...@redhat.com>
Signed-off-by: Jiri Kosina <jkos...@suse.cz>
Signed-off-by: Sasha Levin <alexander.le...@microsoft.com>
---
 drivers/hid/i2c-hid/i2c-hid.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c
index eae0cb3ddec6..3d1506f1c590 100644
--- a/drivers/hid/i2c-hid/i2c-hid.c
+++ b/drivers/hid/i2c-hid/i2c-hid.c
@@ -1002,18 +1002,18 @@ static int i2c_hid_probe(struct i2c_client *client,
                return client->irq;
        }
 
-       ihid = kzalloc(sizeof(struct i2c_hid), GFP_KERNEL);
+       ihid = devm_kzalloc(&client->dev, sizeof(*ihid), GFP_KERNEL);
        if (!ihid)
                return -ENOMEM;
 
        if (client->dev.of_node) {
                ret = i2c_hid_of_probe(client, &ihid->pdata);
                if (ret)
-                       goto err;
+                       return ret;
        } else if (!platform_data) {
                ret = i2c_hid_acpi_pdata(client, &ihid->pdata);
                if (ret)
-                       goto err;
+                       return ret;
        } else {
                ihid->pdata = *platform_data;
        }
@@ -1126,7 +1126,6 @@ static int i2c_hid_probe(struct i2c_client *client,
 
 err:
        i2c_hid_free_buffers(ihid);
-       kfree(ihid);
        return ret;
 }
 
@@ -1150,8 +1149,6 @@ static int i2c_hid_remove(struct i2c_client *client)
 
        regulator_disable(ihid->pdata.supply);
 
-       kfree(ihid);
-
        return 0;
 }
 
-- 
2.17.1