Home Home > GIT Browse > SLE15-SP1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Tesarik <ptesarik@suse.cz>2019-10-07 12:54:05 +0200
committerPetr Tesarik <ptesarik@suse.cz>2019-10-07 12:54:05 +0200
commit4fbb48ea1d804daa5d8ef57c7eacc7e2a0a79301 (patch)
treeace1f2d8b11f3d6a39858218609e62cd5fc6d1bc
parentc8241d2875fce8462868f03159d75fed9f16e2f7 (diff)
parent57f85ac6359e1944993a549840a7679ca64861f0 (diff)
Merge branch 'users/pvorel/SLE15/for-next' into SLE15rpm-4.12.14-150.38--sle15-updatesrpm-4.12.14-150.38
Pull alarmtimer fix from Petr Vorel suse-commit: 3106fa5672fb170d26ee3a4d601510ee85099d4c
-rw-r--r--kernel/time/alarmtimer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index ae9e7338dc13..8d2b82240e45 100644
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -581,7 +581,7 @@ static int alarm_timer_create(struct k_itimer *new_timer)
enum alarmtimer_type type;
if (!alarmtimer_get_rtcdev())
- return -ENOTSUPP;
+ return -EOPNOTSUPP;
if (!capable(CAP_WAKE_ALARM))
return -EPERM;
@@ -809,7 +809,7 @@ static int alarm_timer_nsleep(const clockid_t which_clock, int flags,
int ret = 0;
if (!alarmtimer_get_rtcdev())
- return -ENOTSUPP;
+ return -EOPNOTSUPP;
if (flags & ~TIMER_ABSTIME)
return -EINVAL;