OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9370e15
)
alarmtimer: Change remaining ENOTSUPP to EOPNOTSUPP
author
Petr Vorel
<pvorel@suse.cz>
Fri, 8 Nov 2019 15:51:16 +0000
(16:51 +0100)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Sun, 10 Nov 2019 10:21:39 +0000
(11:21 +0100)
Fix backport of commit
f18ddc13af981ce3c7b7f26925f099e7c6929aba
upstream.
Update backport to change ENOTSUPP to EOPNOTSUPP in
alarm_timer_{del,set}(), which were removed in
f2c45807d3992fe0f173f34af9c347d907c31686
in v4.13-rc1.
Fixes:
c22df8ea7c5831d6fdca2f6f136f0d32d7064ff9
Signed-off-by: Petr Vorel <pvorel@suse.cz>
Acked-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
kernel/time/alarmtimer.c
patch
|
blob
|
history
diff --git
a/kernel/time/alarmtimer.c
b/kernel/time/alarmtimer.c
index
70aef32
..
015d432
100644
(file)
--- a/
kernel/time/alarmtimer.c
+++ b/
kernel/time/alarmtimer.c
@@
-573,7
+573,7
@@
static void alarm_timer_get(struct k_itimer *timr,
static int alarm_timer_del(struct k_itimer *timr)
{
if (!rtcdev)
- return -ENOTSUPP;
+ return -E
OP
NOTSUPP;
if (alarm_try_to_cancel(&timr->it.alarm.alarmtimer) < 0)
return TIMER_RETRY;
@@
-597,7
+597,7
@@
static int alarm_timer_set(struct k_itimer *timr, int flags,
ktime_t exp;
if (!rtcdev)
- return -ENOTSUPP;
+ return -E
OP
NOTSUPP;
if (flags & ~TIMER_ABSTIME)
return -EINVAL;