diff options
| author | Karel Zak | 2017-02-09 11:42:01 +0100 |
|---|---|---|
| committer | Karel Zak | 2017-02-09 11:42:01 +0100 |
| commit | a18f17ad2b6b6868a7bc977fabd89d6ce6b5b740 (patch) | |
| tree | 62ce7fac24dd4414c0a254a4e0032dfd2a859dec /sys-utils/hwclock.c | |
| parent | Merge branch 'hwclock-jwp-reviewed' of git://github.com/kerolasa/lelux-utilit... (diff) | |
| download | kernel-qcow2-util-linux-a18f17ad2b6b6868a7bc977fabd89d6ce6b5b740.tar.gz kernel-qcow2-util-linux-a18f17ad2b6b6868a7bc977fabd89d6ce6b5b740.tar.xz kernel-qcow2-util-linux-a18f17ad2b6b6868a7bc977fabd89d6ce6b5b740.zip | |
hwclock: remove if-if-condition
Diffstat (limited to 'sys-utils/hwclock.c')
| -rw-r--r-- | sys-utils/hwclock.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c index 02a028950..059ee4099 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) { |