]> git.itanic.dy.fi Git - linux-stable/commitdiff
pwm: omap-dmtimer: put_device() after of_find_device_by_node()
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Mon, 11 Nov 2019 09:03:56 +0000 (10:03 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Mar 2020 15:42:22 +0000 (16:42 +0100)
commit c7cb3a1dd53f63c64fb2b567d0be130b92a44d91 upstream.

This was found by coccicheck:

drivers/pwm/pwm-omap-dmtimer.c:304:2-8: ERROR: missing put_device;
call of_find_device_by_node on line 255, but without a corresponding
object release within this function.

Reported-by: Markus Elfring <elfring@users.sourceforge.net>
Fixes: 6604c6556db9 ("pwm: Add PWM driver for OMAP using dual-mode timers")
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/pwm/pwm-omap-dmtimer.c

index c6e710a713d3196da5eed1909d9f5007fcd7f581..527b87959742340e0b8d8fb5323e7e814927c8a2 100644 (file)
@@ -259,7 +259,7 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev)
        if (!timer_pdev) {
                dev_err(&pdev->dev, "Unable to find Timer pdev\n");
                ret = -ENODEV;
-               goto put;
+               goto err_find_timer_pdev;
        }
 
        timer_pdata = dev_get_platdata(&timer_pdev->dev);
@@ -267,7 +267,7 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev)
                dev_dbg(&pdev->dev,
                         "dmtimer pdata structure NULL, deferring probe\n");
                ret = -EPROBE_DEFER;
-               goto put;
+               goto err_platdata;
        }
 
        pdata = timer_pdata->timer_ops;
@@ -286,19 +286,19 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev)
            !pdata->write_counter) {
                dev_err(&pdev->dev, "Incomplete dmtimer pdata structure\n");
                ret = -EINVAL;
-               goto put;
+               goto err_platdata;
        }
 
        if (!of_get_property(timer, "ti,timer-pwm", NULL)) {
                dev_err(&pdev->dev, "Missing ti,timer-pwm capability\n");
                ret = -ENODEV;
-               goto put;
+               goto err_timer_property;
        }
 
        dm_timer = pdata->request_by_node(timer);
        if (!dm_timer) {
                ret = -EPROBE_DEFER;
-               goto put;
+               goto err_request_timer;
        }
 
        omap = devm_kzalloc(&pdev->dev, sizeof(*omap), GFP_KERNEL);
@@ -355,7 +355,14 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev)
 err_alloc_omap:
 
        pdata->free(dm_timer);
-put:
+err_request_timer:
+
+err_timer_property:
+err_platdata:
+
+       put_device(&timer_pdev->dev);
+err_find_timer_pdev:
+
        of_node_put(timer);
 
        return ret;
@@ -375,6 +382,8 @@ static int pwm_omap_dmtimer_remove(struct platform_device *pdev)
 
        omap->pdata->free(omap->dm_timer);
 
+       put_device(&omap->dm_timer_pdev->dev);
+
        mutex_destroy(&omap->mutex);
 
        return 0;