git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/usb-audio' into for-linus
[pandora-kernel.git]
/
kernel
/
timer.c
diff --git
a/kernel/timer.c
b/kernel/timer.c
index
0b36b9e
..
a7f07d5
100644
(file)
--- a/
kernel/timer.c
+++ b/
kernel/timer.c
@@
-714,7
+714,7
@@
int mod_timer(struct timer_list *timer, unsigned long expires)
* networking code - if the timer is re-modified
* to be the same thing then just return:
*/
* networking code - if the timer is re-modified
* to be the same thing then just return:
*/
- if (timer
->expires == expires && timer_pending(timer)
)
+ if (timer
_pending(timer) && timer->expires == expires
)
return 1;
return __mod_timer(timer, expires, false, TIMER_NOT_PINNED);
return 1;
return __mod_timer(timer, expires, false, TIMER_NOT_PINNED);