summaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorLucas Tanure <tanure@linux.com>2020-02-29 18:43:34 +0100
committerJiri Kosina <jkosina@suse.cz>2020-03-13 17:33:11 +0100
commit910a7e89cec65efad254c947ce2bf8bf5b370962 (patch)
tree92db98aba5219c5e295d45d6692e350aba429618 /drivers/hid
parentHID: appleir: Remove unnecessary goto label (diff)
downloadlinux-910a7e89cec65efad254c947ce2bf8bf5b370962.tar.xz
linux-910a7e89cec65efad254c947ce2bf8bf5b370962.zip
HID: appleir: Use devm_kzalloc() instead of kzalloc()
Signed-off-by: Lucas Tanure <tanure@linux.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-appleir.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/hid/hid-appleir.c b/drivers/hid/hid-appleir.c
index aafc285b538f..8deded185725 100644
--- a/drivers/hid/hid-appleir.c
+++ b/drivers/hid/hid-appleir.c
@@ -283,7 +283,7 @@ static int appleir_probe(struct hid_device *hid, const struct hid_device_id *id)
int ret;
struct appleir *appleir;
- appleir = kzalloc(sizeof(struct appleir), GFP_KERNEL);
+ appleir = devm_kzalloc(&hid->dev, sizeof(struct appleir), GFP_KERNEL);
if (!appleir)
return -ENOMEM;
@@ -311,7 +311,7 @@ static int appleir_probe(struct hid_device *hid, const struct hid_device_id *id)
return 0;
fail:
- kfree(appleir);
+ devm_kfree(&hid->dev, appleir);
return ret;
}
@@ -320,7 +320,6 @@ static void appleir_remove(struct hid_device *hid)
struct appleir *appleir = hid_get_drvdata(hid);
hid_hw_stop(hid);
del_timer_sync(&appleir->key_up_timer);
- kfree(appleir);
}
static const struct hid_device_id appleir_devices[] = {