From: Paul Fox <pgf@laptop.org>
Date: Fri, 30 Mar 2012 12:16:50 +0000 (-0400)
Subject: rtcwake: only invoke RTC_AIE_ON/OFF ioctls in pairs
X-Git-Tag: v2.22-rc1~566
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1707576155daf644c5df3c1776b52fd297ff9318;p=thirdparty%2Futil-linux.git

rtcwake: only invoke RTC_AIE_ON/OFF ioctls in pairs

many rtc drivers don't implement the RTC_AIE_ON/OFF ioctls at all --
so if we never tried to enable the alarm interrupt, don't try to
disable it later.

Signed-off-by: Paul Fox <pgf@laptop.org>
---

diff --git a/sys-utils/rtcwake.c b/sys-utils/rtcwake.c
index 4aa5057fe6..57e4e8b344 100644
--- a/sys-utils/rtcwake.c
+++ b/sys-utils/rtcwake.c
@@ -63,6 +63,7 @@ enum ClockMode {
 
 static unsigned		verbose;
 static unsigned		dryrun;
+static unsigned		ioctl_aie_on;  // ioctl(AIE_ON) succeeded
 enum ClockMode		clock_mode = CM_AUTO;
 
 static struct option long_options[] = {
@@ -241,6 +242,7 @@ static int setup_alarm(int fd, time_t *wakeup)
 				warn(_("enable rtc alarm failed"));
 				return -1;
 			}
+			ioctl_aie_on = 1;
 		} else {
 			warn(_("set rtc wake alarm failed"));
 			return -1;
@@ -613,7 +615,8 @@ int main(int argc, char **argv)
 		suspend_system(suspend);
 	}
 
-	if (!dryrun && ioctl(fd, RTC_AIE_OFF, 0) < 0)
+	if (!dryrun && ioctl_aie_on && ioctl(fd, RTC_AIE_OFF, 0) < 0)
+
 		warn(_("disable rtc alarm interrupt failed"));
 
 	close(fd);