lkml.org 
[lkml]   [2020]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 131/152] pwm: omap-dmtimer: put_device() after of_find_device_by_node()
    Date
    From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

    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 | 21 +++++++++++++++------
    1 file changed, 15 insertions(+), 6 deletions(-)

    --- a/drivers/pwm/pwm-omap-dmtimer.c
    +++ b/drivers/pwm/pwm-omap-dmtimer.c
    @@ -256,7 +256,7 @@ static int pwm_omap_dmtimer_probe(struct
    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);
    @@ -264,7 +264,7 @@ static int pwm_omap_dmtimer_probe(struct
    dev_dbg(&pdev->dev,
    "dmtimer pdata structure NULL, deferring probe\n");
    ret = -EPROBE_DEFER;
    - goto put;
    + goto err_platdata;
    }

    pdata = timer_pdata->timer_ops;
    @@ -283,19 +283,19 @@ static int pwm_omap_dmtimer_probe(struct
    !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);
    @@ -352,7 +352,14 @@ err_pwmchip_add:
    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;
    @@ -372,6 +379,8 @@ static int pwm_omap_dmtimer_remove(struc

    omap->pdata->free(omap->dm_timer);

    + put_device(&omap->dm_timer_pdev->dev);
    +
    mutex_destroy(&omap->mutex);

    return 0;

    \
     
     \ /
      Last update: 2020-03-03 18:59    [W:4.091 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site