diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-21 12:05:40 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-21 12:05:40 +0100 |
| commit | 1f26cb92a28541da1c9b27571e40b08333595773 (patch) | |
| tree | 90e9c7f7fe9bdccc6cd356afcf3977af256c9a21 /sound/oss/pss.c | |
| parent | 2c3b9b50db5fe8d6039dfdfc44202fcd49eb9d00 (diff) | |
| parent | db8cf334f66bdf1ba2b3d2f7128095fc9b7a6e2b (diff) | |
| download | op-kernel-dev-1f26cb92a28541da1c9b27571e40b08333595773.zip op-kernel-dev-1f26cb92a28541da1c9b27571e40b08333595773.tar.gz | |
Merge branch 'fix/misc' into for-linus
Diffstat (limited to 'sound/oss/pss.c')
| -rw-r--r-- | sound/oss/pss.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/oss/pss.c b/sound/oss/pss.c index 83f5ee2..e19dd5d 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) |
