| Message ID | 1459793646-16000-1-git-send-email-shubhraj@xilinx.com |
|---|---|
| State | New |
| Headers | show |
On Mon, Apr 4, 2016 at 8:14 PM, Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com> wrote: > pm_runtime_disable is called only in remove it is missed > out in the error path. > Fix the same. > > Signed-off-by: Shubhrajyoti Datta <shubhraj@xilinx.com> Patch applied. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/gpio/gpio-zynq.c b/drivers/gpio/gpio-zynq.c index 66d3d24..75c6355 100644 --- a/drivers/gpio/gpio-zynq.c +++ b/drivers/gpio/gpio-zynq.c @@ -713,7 +713,7 @@ static int zynq_gpio_probe(struct platform_device *pdev) pm_runtime_enable(&pdev->dev); ret = pm_runtime_get_sync(&pdev->dev); if (ret < 0) - return ret; + goto err_pm_dis; /* report a bug if gpio chip registration fails */ ret = gpiochip_add_data(chip, gpio); @@ -745,6 +745,8 @@ err_rm_gpiochip: gpiochip_remove(chip); err_pm_put: pm_runtime_put(&pdev->dev); +err_pm_dis: + pm_runtime_disable(&pdev->dev); return ret; }
pm_runtime_disable is called only in remove it is missed out in the error path. Fix the same. Signed-off-by: Shubhrajyoti Datta <shubhraj@xilinx.com> --- drivers/gpio/gpio-zynq.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)