alarmtimer: Check RTC features instead of ops
authorAlexandre Belloni <alexandre.belloni@bootlin.com>
Tue, 11 May 2021 01:45:16 +0000 (03:45 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 11 May 2021 19:28:04 +0000 (21:28 +0200)
RTC drivers used to leave .set_alarm() NULL in order to signal the RTC
device doesn't support alarms. The drivers are now clearing the
RTC_FEATURE_ALARM bit for that purpose in order to keep the rtc_class_ops
structure const. So now, .set_alarm() is set unconditionally and this
possibly causes the alarmtimer code to select an RTC device that doesn't
support alarms.

Test RTC_FEATURE_ALARM instead of relying on ops->set_alarm to determine
whether alarms are available.

Fixes: 7ae41220ef58 ("rtc: introduce features bitfield")
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20210511014516.563031-1-alexandre.belloni@bootlin.com
kernel/time/alarmtimer.c

index bea9d08..5897828 100644 (file)
@@ -92,7 +92,7 @@ static int alarmtimer_rtc_add_device(struct device *dev,
        if (rtcdev)
                return -EBUSY;
 
-       if (!rtc->ops->set_alarm)
+       if (!test_bit(RTC_FEATURE_ALARM, rtc->features))
                return -1;
        if (!device_may_wakeup(rtc->dev.parent))
                return -1;