]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
rtc: omap: fix error path when pinctrl_register fails
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>
Thu, 12 Oct 2017 22:06:44 +0000 (00:06 +0200)
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>
Tue, 31 Oct 2017 16:31:10 +0000 (17:31 +0100)
If pinctrl_register() fails probe will return with an error without locking
the RTC and disabling pm_runtime.
Set ret and jump to err instead.

Fixes: 97ea1906b3c2 ("rtc: omap: Support ext_wakeup configuration")
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
drivers/rtc/rtc-omap.c

index 13f7cd11c07eb52948121225242b57f8ab2c8e2c..3bdc041fc2e9caa86ac6398843439bd9c046d849 100644 (file)
@@ -830,7 +830,8 @@ static int omap_rtc_probe(struct platform_device *pdev)
        rtc->pctldev = pinctrl_register(&rtc_pinctrl_desc, &pdev->dev, rtc);
        if (IS_ERR(rtc->pctldev)) {
                dev_err(&pdev->dev, "Couldn't register pinctrl driver\n");
-               return PTR_ERR(rtc->pctldev);
+               ret = PTR_ERR(rtc->pctldev);
+               goto err;
        }
 
        return 0;