Commit 551757eb authored Jul 04, 2018 by Johan Hovold Committed by Alexandre Belloni Jul 12, 2018

rtc: omap: fix resource leak in registration error path



Make sure to deregister the pin controller in case rtc registration
fails.

Fixes: 57072758 ("rtc: omap: switch to rtc_register_device")
Cc: stable <stable@vger.kernel.org>     # 4.14
Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

parent 5c8b84f4

drivers/rtc/rtc-omap.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -873,7 +873,7 @@ static int omap_rtc_probe(struct platform_device *pdev)

		ret = rtc_register_device(rtc->rtc);
		if (ret)
		goto err;
		goto err_deregister_pinctrl;

		rtc_nvmem_register(rtc->rtc, &omap_rtc_nvmem_config);

		@@ -886,6 +886,8 @@ static int omap_rtc_probe(struct platform_device *pdev)

		return 0;

		err_deregister_pinctrl:
		pinctrl_unregister(rtc->pctldev);
		err:
		clk_disable_unprepare(rtc->clk);
		device_init_wakeup(&pdev->dev, false);