Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into fixes

1 files changed, 3 insertions, 3 deletions

diff --git a/sound/oss/pss.c b/sound/oss/pss.c
index 83f5ee236b12..e19dd5dcc2de 100644
--- a/sound/oss/pss.c
+++ b/sound/oss/pss.c
@@ -269,7 +269,7 @@ static int pss_reset_dsp(pss_confdata * devc)
         unsigned long   i, limit = jiffies + HZ/10;
 
         outw(0x2000, REG(PSS_CONTROL));
-        for (i = 0; i < 32768 && (limit-jiffies >= 0); i++)
+        for (i = 0; i < 32768 && time_after_eq(limit, jiffies); i++)
                 inw(REG(PSS_CONTROL));
         outw(0x0000, REG(PSS_CONTROL));
         return 1;
@@ -369,11 +369,11 @@ static int pss_download_boot(pss_confdata * devc, unsigned char *block, int size
                 outw(0, REG(PSS_DATA));
 
                 limit = jiffies + HZ/10;
-                for (i = 0; i < 32768 && (limit - jiffies >= 0); i++)
+                for (i = 0; i < 32768 && time_after_eq(limit, jiffies); i++)
                         val = inw(REG(PSS_STATUS));
 
                 limit = jiffies + HZ/10;
-                for (i = 0; i < 32768 && (limit-jiffies >= 0); i++)
+                for (i = 0; i < 32768 && time_after_eq(limit, jiffies); i++)
                 {
                         val = inw(REG(PSS_STATUS));
                         if (val & 0x4000)