Commit 83ebb7b3 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Alexandre Belloni
Browse files

rtc: cmos: Disable ACPI RTC event on removal 



Make cmos_do_remove() drop the ACPI RTC fixed event handler so as to
prevent it from operating on stale data in case the event triggers
after driver removal.

Fixes: 311ee9c1 ("rtc: cmos: allow using ACPI for RTC alarm instead of HPET")
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarZhang Rui <rui.zhang@intel.com>
Tested-by: default avatarZhang Rui <rui.zhang@intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/2224609.iZASKD2KPV@kreacher


Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent d13e9ad9

drivers/rtc/rtc-cmos.c

+15 −0
Original line number Diff line number Diff line
@@ -798,6 +798,14 @@ static void acpi_rtc_event_setup(struct device *dev) 
	acpi_disable_event(ACPI_EVENT_RTC, 0);

}



static void acpi_rtc_event_cleanup(void)

{

	if (acpi_disabled)

		return;



	acpi_remove_fixed_event_handler(ACPI_EVENT_RTC, rtc_handler);

}



static void rtc_wake_on(struct device *dev)

{

	acpi_clear_event(ACPI_EVENT_RTC);
@@ -884,6 +892,10 @@ static inline void acpi_rtc_event_setup(struct device *dev) 
{

}



static inline void acpi_rtc_event_cleanup(void)

{

}



static inline void acpi_cmos_wake_setup(struct device *dev)

{

}
@@ -1138,6 +1150,9 @@ static void cmos_do_remove(struct device *dev) 
			hpet_unregister_irq_handler(cmos_interrupt);

	}



	if (!dev_get_platdata(dev))

		acpi_rtc_event_cleanup();



	cmos->rtc = NULL;



	ports = cmos->iomem;