From: Karel Zak <kzak@redhat.com>
Date: Thu, 23 Nov 2017 09:30:27 +0000 (+0100)
Subject: hwclock: revert ioctl test
X-Git-Tag: v2.31.1~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=32337d96b1fda2d8bfff753277f45a1ba0ee118c;p=thirdparty%2Futil-linux.git

hwclock: revert ioctl test

This commit reverts 1d5cffa16a0183175684809cf215294ec20b8fd9.

(I did this revert manually as there was another changes in the code
and git-revert does not work in this case.)

Addresses: https://github.com/karelzak/util-linux/issues/543
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/sys-utils/hwclock-rtc.c b/sys-utils/hwclock-rtc.c
index 62e4329370..cdd7d80d60 100644
--- a/sys-utils/hwclock-rtc.c
+++ b/sys-utils/hwclock-rtc.c
@@ -261,7 +261,7 @@ static int synchronize_to_clock_tick_rtc(const struct hwclock_control *ctl)
 		 * they should.
 		 */
 		rc = -1;
-		errno = ENOTTY;
+		errno = EINVAL;
 #else
 		rc = ioctl(rtc_fd, RTC_UIE_ON, 0);
 #endif
@@ -296,7 +296,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) {
+		} else if (errno == ENOTTY || errno == EINVAL) {
 			/* rtc ioctl interrupts are unimplemented */
 			ret = busywait_for_rtc_clock_tick(ctl, rtc_fd);
 		} else