Commit 453fa43c authored by Linus Torvalds's avatar Linus Torvalds

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()
parents b7213ffa 13be2efc
...@@ -1047,7 +1047,9 @@ static void cmos_check_wkalrm(struct device *dev) ...@@ -1047,7 +1047,9 @@ static void cmos_check_wkalrm(struct device *dev)
* ACK the rtc irq here * ACK the rtc irq here
*/ */
if (t_now >= cmos->alarm_expires && cmos_use_acpi_alarm()) { if (t_now >= cmos->alarm_expires && cmos_use_acpi_alarm()) {
local_irq_disable();
cmos_interrupt(0, (void *)cmos->rtc); cmos_interrupt(0, (void *)cmos->rtc);
local_irq_enable();
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment