Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rtc: omap: fix unbalanced clk_prepare_enable/clk_disable_unprepare

Browse source 
There are 2 error paths after clk_prepare_enable() was called, where
clk_disable_unprepare() is missing.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Andreas Platschek <andreas.platschek@opentech.at>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
This commit is contained in:
Andreas Platschek 2017-12-06 20:42:38 +01:00 committed by Alexandre Belloni
parent 994ec64c0a
commit 2da6877f0e
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/rtc/rtc-omap.c
View file

@ -753,8 +753,10 @@ static int omap_rtc_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
rtc->base = devm_ioremap_resource(&pdev->dev, res); rtc->base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(rtc->base)) if (IS_ERR(rtc->base)) {
clk_disable_unprepare(rtc->clk);
return PTR_ERR(rtc->base); return PTR_ERR(rtc->base);
}
platform_set_drvdata(pdev, rtc); platform_set_drvdata(pdev, rtc);
@ -887,6 +889,7 @@ static int omap_rtc_probe(struct platform_device *pdev)
return 0; return 0;
err: err:
clk_disable_unprepare(rtc->clk);
device_init_wakeup(&pdev->dev, false); device_init_wakeup(&pdev->dev, false);
rtc->type->lock(rtc); rtc->type->lock(rtc);
pm_runtime_put_sync(&pdev->dev); pm_runtime_put_sync(&pdev->dev);