diff options
| author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2017-10-13 00:06:44 +0200 |
|---|---|---|
| committer | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2017-10-31 17:31:10 +0100 |
| commit | 26e480f7bb7840fc0daa9c3af7c4501b2cf5902f (patch) | |
| tree | 39c84568bfa55e44a1be0c58b2672c32b21049ee /drivers/rtc | |
| parent | 3ba2c76a9d3a339cd1b77e88915680ae2e9ac2da (diff) | |
rtc: omap: fix error path when pinctrl_register fails
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>
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-omap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c index 13f7cd11c07e..3bdc041fc2e9 100644 --- a/drivers/rtc/rtc-omap.c +++ b/drivers/rtc/rtc-omap.c @@ -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; |