From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Date: Thu, 12 Oct 2017 22:06:44 +0000 (+0200)
Subject: rtc: omap: fix error path when pinctrl_register fails
X-Git-Tag: v4.14.85~17
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7eebc934f302922de7c7399db4752956c19f7147;p=users%2Fjedix%2Flinux-maple.git

rtc: omap: fix error path when pinctrl_register fails

commit 26e480f7bb7840fc0daa9c3af7c4501b2cf5902f upstream.

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>
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
index ac6e6a6a194c7..ae6506a8b4f5c 100644
--- a/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@ -823,7 +823,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;
 	}
 
 	if (rtc->is_pmic_controller) {