提交 1cf85b23 编写于 作者: A Alexandre Belloni

rtc: sa1100: fix unbalanced clk_prepare_enable/clk_disable_unprepare

In the error path of sa1100_rtc_open(), info->clk is disabled which will
happen again in sa1100_rtc_remove() when the module is removed whereas it
is only enabled once in sa1100_rtc_init().

Fixes: 0cc0c38e ("drivers/rtc/rtc-sa1100.c: move clock enable/disable to probe/remove")
Acked-by: NRobert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: NAlexandre Belloni <alexandre.belloni@free-electrons.com>
上级 56c0c529
...@@ -104,7 +104,7 @@ static int sa1100_rtc_open(struct device *dev) ...@@ -104,7 +104,7 @@ static int sa1100_rtc_open(struct device *dev)
ret = request_irq(info->irq_1hz, sa1100_rtc_interrupt, 0, "rtc 1Hz", dev); ret = request_irq(info->irq_1hz, sa1100_rtc_interrupt, 0, "rtc 1Hz", dev);
if (ret) { if (ret) {
dev_err(dev, "IRQ %d already in use.\n", info->irq_1hz); dev_err(dev, "IRQ %d already in use.\n", info->irq_1hz);
goto fail_ui; return ret;
} }
ret = request_irq(info->irq_alarm, sa1100_rtc_interrupt, 0, "rtc Alrm", dev); ret = request_irq(info->irq_alarm, sa1100_rtc_interrupt, 0, "rtc Alrm", dev);
if (ret) { if (ret) {
...@@ -118,8 +118,6 @@ static int sa1100_rtc_open(struct device *dev) ...@@ -118,8 +118,6 @@ static int sa1100_rtc_open(struct device *dev)
fail_ai: fail_ai:
free_irq(info->irq_1hz, dev); free_irq(info->irq_1hz, dev);
fail_ui:
clk_disable_unprepare(info->clk);
return ret; return ret;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册