Commit 08d94274 authored by Ladislav Michl's avatar Ladislav Michl Committed by Mauro Carvalho Chehab

[media] media: rc: gpio-ir-recv: use devm_kzalloc

Use of devm_kzalloc simplifies error unwinding.
Signed-off-by: default avatarLadislav Michl <ladis@linux-mips.org>
Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 94d40b2f
...@@ -118,15 +118,13 @@ static int gpio_ir_recv_probe(struct platform_device *pdev) ...@@ -118,15 +118,13 @@ static int gpio_ir_recv_probe(struct platform_device *pdev)
if (pdata->gpio_nr < 0) if (pdata->gpio_nr < 0)
return -EINVAL; return -EINVAL;
gpio_dev = kzalloc(sizeof(struct gpio_rc_dev), GFP_KERNEL); gpio_dev = devm_kzalloc(dev, sizeof(*gpio_dev), GFP_KERNEL);
if (!gpio_dev) if (!gpio_dev)
return -ENOMEM; return -ENOMEM;
rcdev = rc_allocate_device(RC_DRIVER_IR_RAW); rcdev = rc_allocate_device(RC_DRIVER_IR_RAW);
if (!rcdev) { if (!rcdev)
rc = -ENOMEM; return -ENOMEM;
goto err_allocate_device;
}
rcdev->priv = gpio_dev; rcdev->priv = gpio_dev;
rcdev->device_name = GPIO_IR_DEVICE_NAME; rcdev->device_name = GPIO_IR_DEVICE_NAME;
...@@ -182,8 +180,6 @@ static int gpio_ir_recv_probe(struct platform_device *pdev) ...@@ -182,8 +180,6 @@ static int gpio_ir_recv_probe(struct platform_device *pdev)
gpio_free(pdata->gpio_nr); gpio_free(pdata->gpio_nr);
err_gpio_request: err_gpio_request:
rc_free_device(rcdev); rc_free_device(rcdev);
err_allocate_device:
kfree(gpio_dev);
return rc; return rc;
} }
...@@ -194,7 +190,6 @@ static int gpio_ir_recv_remove(struct platform_device *pdev) ...@@ -194,7 +190,6 @@ static int gpio_ir_recv_remove(struct platform_device *pdev)
free_irq(gpio_to_irq(gpio_dev->gpio_nr), gpio_dev); free_irq(gpio_to_irq(gpio_dev->gpio_nr), gpio_dev);
rc_unregister_device(gpio_dev->rcdev); rc_unregister_device(gpio_dev->rcdev);
gpio_free(gpio_dev->gpio_nr); gpio_free(gpio_dev->gpio_nr);
kfree(gpio_dev);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment