Commit 7eebc934 authored Oct 13, 2017 by Alexandre Belloni Committed by Greg Kroah-Hartman Dec 01, 2018

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: 97ea1906 ("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>

parent 31a67370

drivers/rtc/rtc-omap.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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) {