From: Karel Zak <kzak@redhat.com>
Date: Thu, 9 Feb 2017 10:42:01 +0000 (+0100)
Subject: hwclock: remove if-if-condition
X-Git-Tag: v2.30-rc1~266
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=a18f17ad2b6b6868a7bc977fabd89d6ce6b5b740;p=thirdparty%2Futil-linux.git

hwclock: remove if-if-condition
---

diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
index 02a028950e..059ee40994 100644
--- a/sys-utils/hwclock.c
+++ b/sys-utils/hwclock.c
@@ -1201,9 +1201,8 @@ manipulate_clock(const struct hwclock_control *ctl, const time_t set_time,
 	/* local return code */
 	int rc = 0;
 
-	if (!ctl->systz && !ctl->predict)
-		if (ur->get_permissions())
-			return EX_NOPERM;
+	if (!ctl->systz && !ctl->predict && ur->get_permissions())
+		return EX_NOPERM;
 
 	if ((ctl->set || ctl->systohc || ctl->adjust) &&
 	    (adjtime->local_utc == UTC) != ctl->universal) {