From 1d5cffa16a0183175684809cf215294ec20b8fd9 Mon Sep 17 00:00:00 2001 From: J William Piggott Date: Sun, 23 Jul 2017 20:16:03 -0400 Subject: hwclock: fix unimplemented ioctl test The rtc driver has not returned EINVAL for unimplemented ioctls since v2.5.8 in 2002. However, it does return it for other errors; making the current test potentially problematic. Since 9f3d0fc util-linux assumes kernel >= 2.6.0 so remove EINVAL as an ioctl test. Signed-off-by: J William Piggott --- sys-utils/hwclock-rtc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys-utils/hwclock-rtc.c') diff --git a/sys-utils/hwclock-rtc.c b/sys-utils/hwclock-rtc.c index 36ce39761..ea8357daf 100644 --- a/sys-utils/hwclock-rtc.c +++ b/sys-utils/hwclock-rtc.c @@ -257,7 +257,7 @@ static int synchronize_to_clock_tick_rtc(const struct hwclock_control *ctl) * they should. */ rc = -1; - errno = EINVAL; + errno = ENOTTY; #else rc = ioctl(rtc_fd, RTC_UIE_ON, 0); #endif @@ -293,7 +293,7 @@ static int synchronize_to_clock_tick_rtc(const struct hwclock_control *ctl) if (rc == -1) warn(_("ioctl() to %s to turn off update interrupts failed"), rtc_dev_name); - } else if (errno == ENOTTY || errno == EINVAL) { + } else if (errno == ENOTTY) { /* * This rtc device doesn't have interrupt functions. * This is typical on an Alpha, where the Hardware -- cgit v1.2.3-55-g7522