diff options
| author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2017-08-21 18:00:38 +0200 |
|---|---|---|
| committer | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2017-08-24 11:03:35 +0200 |
| commit | 1cf85b2327a9b03bde5266e72ee64a38d085256d (patch) | |
| tree | 8cfb598b080292e5d713083d7c764afd76f113c4 | |
| parent | 56c0c529848c853bc1049e271975917e8c9f4389 (diff) | |
| download | linux-stable-1cf85b2327a9b03bde5266e72ee64a38d085256d.tar.gz linux-stable-1cf85b2327a9b03bde5266e72ee64a38d085256d.tar.bz2 linux-stable-1cf85b2327a9b03bde5266e72ee64a38d085256d.zip | |
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: 0cc0c38e9139 ("drivers/rtc/rtc-sa1100.c: move clock enable/disable to probe/remove")
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
| -rw-r--r-- | drivers/rtc/rtc-sa1100.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c index c2187bf6c7e4..fe8ebf47bbe5 100644 --- a/drivers/rtc/rtc-sa1100.c +++ b/drivers/rtc/rtc-sa1100.c @@ -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); if (ret) { 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); if (ret) { @@ -118,8 +118,6 @@ static int sa1100_rtc_open(struct device *dev) fail_ai: free_irq(info->irq_1hz, dev); - fail_ui: - clk_disable_unprepare(info->clk); return ret; } |