X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kernel%2Ftimer.c;h=a7f07d5a6241d882af4466ec3280a89f2681e8c9;hb=fd30afa454282bbe1b36d5d77bd72c0ea5b3f97c;hp=0b36b9e5cc8b4e27f6adf89de403885cfe8a6687;hpb=04eef90c2e2fb860db71bff5f60d5ff0ec4c6dea;p=pandora-kernel.git

diff --git a/kernel/timer.c b/kernel/timer.c
index 0b36b9e5cc8b..a7f07d5a6241 100644
--- 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:
 	 */
-	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);