Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "rtc: alarm: Fix data handling issue with alarm->type"

This commit is contained in:
Linux Build Service Account 2015-03-16 08:49:40 -07:00 committed by Gerrit - the friendly Code Review server
parent a7506a14ae dcde73d2da
commit 21664b56d2
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kernel/time/alarmtimer.c
View File

@ -524,8 +524,13 @@ int alarm_start(struct alarm *alarm, ktime_t start)
*/
int alarm_start_relative(struct alarm *alarm, ktime_t start)
{
struct alarm_base *base = &alarm_bases[alarm->type];
struct alarm_base *base;
if (alarm->type >= ALARM_NUMTYPE) {
pr_err("Array out of index\n");
return -EINVAL;
}
base = &alarm_bases[alarm->type];
start = ktime_add(start, base->gettime());
return alarm_start(alarm, start);
}
@ -551,10 +556,15 @@ void alarm_restart(struct alarm *alarm)
*/
int alarm_try_to_cancel(struct alarm *alarm)
{
struct alarm_base *base = &alarm_bases[alarm->type];
struct alarm_base *base;
unsigned long flags;
int ret;
if (alarm->type >= ALARM_NUMTYPE) {
pr_err("Array out of index\n");
return -EINVAL;
}
base = &alarm_bases[alarm->type];
spin_lock_irqsave(&base->lock, flags);
ret = hrtimer_try_to_cancel(&alarm->timer);
if (ret >= 0)