| From 79190ba11287454a6aad03a2a17dbba7863088b1 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de> |
| Date: Mon, 11 Nov 2019 10:03:56 +0100 |
| Subject: [PATCH] pwm: omap-dmtimer: put_device() after |
| of_find_device_by_node() |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/pwm/pwm-omap-dmtimer.c b/drivers/pwm/pwm-omap-dmtimer.c |
| index e36fcad668a6..88a3c5690fea 100644 |
| --- 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 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); |
| @@ -264,7 +264,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; |
| @@ -283,19 +283,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); |
| @@ -352,7 +352,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; |
| @@ -372,6 +379,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; |
| -- |
| 2.7.4 |
| |