evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

alarmtimer: Change remaining ENOTSUPP to EOPNOTSUPP

Browse source 
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: c22df8ea7c

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>
This commit is contained in:
Petr Vorel 2019-11-08 16:51:16 +01:00 • committed by Greg Kroah-Hartman
parent 9370e15d54
commit 87fb5df321
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kernel/time/alarmtimer.c
View file

@ -573,7 +573,7 @@ static void alarm_timer_get(struct k_itimer *timr,
static int alarm_timer_del(struct k_itimer *timr) static int alarm_timer_del(struct k_itimer *timr)
{ {
if (!rtcdev) if (!rtcdev)
return -ENOTSUPP; return -EOPNOTSUPP;
if (alarm_try_to_cancel(&timr->it.alarm.alarmtimer) < 0) if (alarm_try_to_cancel(&timr->it.alarm.alarmtimer) < 0)
return TIMER_RETRY; return TIMER_RETRY;
@ -597,7 +597,7 @@ static int alarm_timer_set(struct k_itimer *timr, int flags,
ktime_t exp; ktime_t exp;
if (!rtcdev) if (!rtcdev)
return -ENOTSUPP; return -EOPNOTSUPP;
if (flags & ~TIMER_ABSTIME) if (flags & ~TIMER_ABSTIME)
return -EINVAL; return -EINVAL;