Signed-off-by: Lucas Tanure <tanure@linux.com> --- drivers/hid/hid-appleir.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/hid/hid-appleir.c b/drivers/hid/hid-appleir.c index bf8d4afe0d6a..aafc285b538f 100644 --- a/drivers/hid/hid-appleir.c +++ b/drivers/hid/hid-appleir.c @@ -284,10 +284,8 @@ static int appleir_probe(struct hid_device *hid, const struct hid_device_id *id) struct appleir *appleir; appleir = kzalloc(sizeof(struct appleir), GFP_KERNEL); - if (!appleir) { - ret = -ENOMEM; - goto allocfail; - } + if (!appleir) + return -ENOMEM; appleir->hid = hid; @@ -314,7 +312,6 @@ static int appleir_probe(struct hid_device *hid, const struct hid_device_id *id) return 0; fail: kfree(appleir); -allocfail: return ret; } -- 2.25.1
Signed-off-by: Lucas Tanure <tanure@linux.com> --- drivers/hid/hid-appleir.c | 5 ++--- 1 file 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[] = { -- 2.25.1
On Sat, 29 Feb 2020, Lucas Tanure wrote:
> Signed-off-by: Lucas Tanure <tanure@linux.com>
> ---
> drivers/hid/hid-appleir.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/hid/hid-appleir.c b/drivers/hid/hid-appleir.c
> index bf8d4afe0d6a..aafc285b538f 100644
> --- a/drivers/hid/hid-appleir.c
> +++ b/drivers/hid/hid-appleir.c
> @@ -284,10 +284,8 @@ static int appleir_probe(struct hid_device *hid, const struct hid_device_id *id)
> struct appleir *appleir;
>
> appleir = kzalloc(sizeof(struct appleir), GFP_KERNEL);
> - if (!appleir) {
> - ret = -ENOMEM;
> - goto allocfail;
> - }
> + if (!appleir)
> + return -ENOMEM;
>
> appleir->hid = hid;
>
> @@ -314,7 +312,6 @@ static int appleir_probe(struct hid_device *hid, const struct hid_device_id *id)
> return 0;
> fail:
> kfree(appleir);
> -allocfail:
> return ret;
> }
Applied, thanks.
--
Jiri Kosina
SUSE Labs