diff options
| author | Linus Torvalds | 2021-09-15 17:06:01 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2021-09-15 17:06:01 -0700 |
| commit | 453fa43cdb8e0f4231ab84755fd2fc562823541b (patch) | |
| tree | 9ac900fb5461e1d931bdad99df13fa0df9cb34c5 | |
| parent | b7213ffa0e585feb1aee3e7173e965e66ee0abaa (diff) | |
| parent | 13be2efc390acd2a46a69a359f6efc00ca434599 (diff) | |
Merge tag 'rtc-5.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
Pull RTC fix from Alexandre Belloni:
"Fix a locking issue in the cmos rtc driver"
* tag 'rtc-5.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
rtc: cmos: Disable irq around direct invocation of cmos_interrupt()
| -rw-r--r-- | drivers/rtc/rtc-cmos.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c index eb15067a605e..4eb53412b808 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c @@ -1047,7 +1047,9 @@ static void cmos_check_wkalrm(struct device *dev) * ACK the rtc irq here */ if (t_now >= cmos->alarm_expires && cmos_use_acpi_alarm()) { + local_irq_disable(); cmos_interrupt(0, (void *)cmos->rtc); + local_irq_enable(); return; } |