Use of devm_rc_allocate_device simplifies error unwinding.

Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
 drivers/media/rc/gpio-ir-recv.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/media/rc/gpio-ir-recv.c b/drivers/media/rc/gpio-ir-recv.c
index fd5742b23447..0e0b6988c08e 100644
--- a/drivers/media/rc/gpio-ir-recv.c
+++ b/drivers/media/rc/gpio-ir-recv.c
@@ -143,7 +143,7 @@ static int gpio_ir_recv_probe(struct platform_device *pdev)
        if (!gpio_dev)
                return -ENOMEM;
 
-       rcdev = rc_allocate_device(RC_DRIVER_IR_RAW);
+       rcdev = devm_rc_allocate_device(dev, RC_DRIVER_IR_RAW);
        if (!rcdev)
                return -ENOMEM;
 
@@ -174,7 +174,7 @@ static int gpio_ir_recv_probe(struct platform_device *pdev)
 
        rc = gpio_request(pdata->gpio_nr, "gpio-ir-recv");
        if (rc < 0)
-               goto err_gpio_request;
+               return rc;
        rc  = gpio_direction_input(pdata->gpio_nr);
        if (rc < 0)
                goto err_gpio_direction_input;
@@ -202,8 +202,6 @@ static int gpio_ir_recv_probe(struct platform_device *pdev)
 err_register_rc_device:
 err_gpio_direction_input:
        gpio_free(pdata->gpio_nr);
-err_gpio_request:
-       rc_free_device(rcdev);
        return rc;
 }
 
-- 
2.11.0

Reply via email to