diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2011-02-14 11:33:17 +0100 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-02-17 14:59:22 -0800 |
| commit | 516373b8b60fa4152334b6b6f2ece0f178c540ce (patch) | |
| tree | fdc88e327f0e7143354b1ea4c190bee21aff6c1f /drivers/rtc/interface.c | |
| parent | d8ce1481ee8770ef2314eb7984a2228dbf64ad06 (diff) | |
| download | linux-3.10-516373b8b60fa4152334b6b6f2ece0f178c540ce.tar.gz linux-3.10-516373b8b60fa4152334b6b6f2ece0f178c540ce.tar.bz2 linux-3.10-516373b8b60fa4152334b6b6f2ece0f178c540ce.zip | |
RTC: Release mutex in error path of rtc_alarm_irq_enable
On hardware that doesn't support alarm interrupts, rtc_alarm_irq_enable
could return without releasing the ops_lock mutex.
This was introduced in
aa0be0f (RTC: Propagate error handling via rtc_timer_enqueue properly)
This patch corrects the issue by only returning once the mutex is
released.
[john.stultz: Reworded the commit log]
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'drivers/rtc/interface.c')
| -rw-r--r-- | drivers/rtc/interface.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c index a0c01967244..413ae053791 100644 --- a/drivers/rtc/interface.c +++ b/drivers/rtc/interface.c @@ -209,9 +209,8 @@ int rtc_alarm_irq_enable(struct rtc_device *rtc, unsigned int enabled) } if (err) - return err; - - if (!rtc->ops) + /* nothing */; + else if (!rtc->ops) err = -ENODEV; else if (!rtc->ops->alarm_irq_enable) err = -EINVAL; |