Merge branch 'master' into tk71

[mv-sheeva.git] / net / rfkill / input.c

diff --git a/net/rfkill/input.c b/net/rfkill/input.c
index 3713d7ecab96b85ccde3024a763aa100e94ca683..1bca6d49ec968bbe32cc75248f07ea6fa59265df 100644 (file)
--- a/net/rfkill/input.c
+++ b/net/rfkill/input.c
@@ -142,7 +142,7 @@ static unsigned long rfkill_last_scheduled;
 static unsigned long rfkill_ratelimit(const unsigned long last)
 {
        const unsigned long delay = msecs_to_jiffies(RFKILL_OPS_DELAY);
-       return (time_after(jiffies, last + delay)) ? 0 : delay;
+       return time_after(jiffies, last + delay) ? 0 : delay;
 }
 
 static void rfkill_schedule_ratelimited(void)