Commit aa5fafd4 authored Nov 23, 2022 by Gaosheng Cui Committed by Greg Kroah-Hartman Jan 18, 2023

rtc: pic32: Move devm_rtc_allocate_device earlier in pic32_rtc_probe()



[ Upstream commit 90cd5c88830140c9fade92a8027e0fb2c6e4cc49 ]

The pic32_rtc_enable(pdata, 0) and clk_disable_unprepare(pdata->clk)
should be called in the error handling of devm_rtc_allocate_device(),
so we should move devm_rtc_allocate_device earlier in pic32_rtc_probe()
to fix it.

Fixes: 6515e23b ("rtc: pic32: convert to devm_rtc_allocate_device")
Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
Link: https://lore.kernel.org/r/20221123015953.1998521-1-cuigaosheng1@huawei.com


Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 686f0793

drivers/rtc/rtc-pic32.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -326,16 +326,16 @@ static int pic32_rtc_probe(struct platform_device *pdev)

		spin_lock_init(&pdata->alarm_lock);

		pdata->rtc = devm_rtc_allocate_device(&pdev->dev);
		if (IS_ERR(pdata->rtc))
		return PTR_ERR(pdata->rtc);

		clk_prepare_enable(pdata->clk);

		pic32_rtc_enable(pdata, 1);

		device_init_wakeup(&pdev->dev, 1);

		pdata->rtc = devm_rtc_allocate_device(&pdev->dev);
		if (IS_ERR(pdata->rtc))
		return PTR_ERR(pdata->rtc);

		pdata->rtc->ops = &pic32_rtcops;
		pdata->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
		pdata->rtc->range_max = RTC_TIMESTAMP_END_2099;