* [PATCH] sound/oss/pss: Fix test of unsigned in pss_reset_dsp() and pss_download_boot()
@ 2009-12-15 22:06 Roel Kluin
2009-12-16 12:00 ` Takashi Iwai
2009-12-17 0:23 ` Troy Kisky
0 siblings, 2 replies; 6+ messages in thread
From: Roel Kluin @ 2009-12-15 22:06 UTC (permalink / raw)
To: Jaroslav Kysela, Takashi Iwai, alsa-devel, Andrew Morton, LKML
limit and jiffies are unsigned so the test does not work.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
Found using coccinelle: http://coccinelle.lip6.fr/
diff --git a/sound/oss/pss.c b/sound/oss/pss.c
index 83f5ee2..9325f4d 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 && (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 && (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 && (limit >= jiffies); i++)
{
val = inw(REG(PSS_STATUS));
if (val & 0x4000)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] sound/oss/pss: Fix test of unsigned in pss_reset_dsp() and pss_download_boot()
2009-12-15 22:06 [PATCH] sound/oss/pss: Fix test of unsigned in pss_reset_dsp() and pss_download_boot() Roel Kluin
@ 2009-12-16 12:00 ` Takashi Iwai
2009-12-16 15:54 ` Roel Kluin
2009-12-17 0:23 ` Troy Kisky
1 sibling, 1 reply; 6+ messages in thread
From: Takashi Iwai @ 2009-12-16 12:00 UTC (permalink / raw)
To: Roel Kluin; +Cc: Jaroslav Kysela, alsa-devel, Andrew Morton, LKML
At Tue, 15 Dec 2009 23:06:18 +0100,
Roel Kluin wrote:
>
> limit and jiffies are unsigned so the test does not work.
>
> Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
> ---
> Found using coccinelle: http://coccinelle.lip6.fr/
>
> diff --git a/sound/oss/pss.c b/sound/oss/pss.c
> index 83f5ee2..9325f4d 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 && (limit >= jiffies); i++)
No, it should use time_after_eq(limit, jiffies) instead.
thanks,
Takashi
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] sound/oss/pss: Fix test of unsigned in pss_reset_dsp() and pss_download_boot()
2009-12-16 12:00 ` Takashi Iwai
@ 2009-12-16 15:54 ` Roel Kluin
2009-12-17 11:36 ` [alsa-devel] " Takashi Iwai
0 siblings, 1 reply; 6+ messages in thread
From: Roel Kluin @ 2009-12-16 15:54 UTC (permalink / raw)
To: Takashi Iwai; +Cc: Jaroslav Kysela, alsa-devel, Andrew Morton, LKML
limit and jiffies are unsigned so the test did not work.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
Found using coccinelle: http://coccinelle.lip6.fr/
>> - for (i = 0; i < 32768 && (limit-jiffies >= 0); i++)
>> + for (i = 0; i < 32768 && (limit >= jiffies); i++)
>
> No, it should use time_after_eq(limit, jiffies) instead.
>
>
> thanks,
>
> Takashi
>
Ok,
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)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [alsa-devel] [PATCH] sound/oss/pss: Fix test of unsigned in pss_reset_dsp() and pss_download_boot()
2009-12-15 22:06 [PATCH] sound/oss/pss: Fix test of unsigned in pss_reset_dsp() and pss_download_boot() Roel Kluin
2009-12-16 12:00 ` Takashi Iwai
@ 2009-12-17 0:23 ` Troy Kisky
2009-12-17 6:47 ` Takashi Iwai
1 sibling, 1 reply; 6+ messages in thread
From: Troy Kisky @ 2009-12-17 0:23 UTC (permalink / raw)
To: Roel Kluin; +Cc: Jaroslav Kysela, Takashi Iwai, alsa-devel, Andrew Morton, LKML
Roel Kluin wrote:
> limit and jiffies are unsigned so the test does not work.
>
> Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
> ---
> Found using coccinelle: http://coccinelle.lip6.fr/
>
> diff --git a/sound/oss/pss.c b/sound/oss/pss.c
> index 83f5ee2..9325f4d 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++)
I think
for (i = 0; i < 32768 && ( (int)(limit-jiffies) >= 0); i++)
works better when jiffies wrap
> + for (i = 0; i < 32768 && (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 && (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 && (limit >= jiffies); i++)
> {
> val = inw(REG(PSS_STATUS));
> if (val & 0x4000)
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [alsa-devel] [PATCH] sound/oss/pss: Fix test of unsigned in pss_reset_dsp() and pss_download_boot()
2009-12-17 0:23 ` Troy Kisky
@ 2009-12-17 6:47 ` Takashi Iwai
0 siblings, 0 replies; 6+ messages in thread
From: Takashi Iwai @ 2009-12-17 6:47 UTC (permalink / raw)
To: Troy Kisky; +Cc: Roel Kluin, Jaroslav Kysela, alsa-devel, Andrew Morton, LKML
At Wed, 16 Dec 2009 17:23:03 -0700,
Troy Kisky wrote:
>
> Roel Kluin wrote:
> > limit and jiffies are unsigned so the test does not work.
> >
> > Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
> > ---
> > Found using coccinelle: http://coccinelle.lip6.fr/
> >
> > diff --git a/sound/oss/pss.c b/sound/oss/pss.c
> > index 83f5ee2..9325f4d 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++)
>
> I think
> for (i = 0; i < 32768 && ( (int)(limit-jiffies) >= 0); i++)
>
> works better when jiffies wrap
Yes, and time_after_eq() takes care of it nicely :)
Takashi
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [alsa-devel] [PATCH] sound/oss/pss: Fix test of unsigned in pss_reset_dsp() and pss_download_boot()
2009-12-16 15:54 ` Roel Kluin
@ 2009-12-17 11:36 ` Takashi Iwai
0 siblings, 0 replies; 6+ messages in thread
From: Takashi Iwai @ 2009-12-17 11:36 UTC (permalink / raw)
To: Roel Kluin; +Cc: LKML, alsa-devel, Andrew Morton
At Wed, 16 Dec 2009 16:54:43 +0100,
Roel Kluin wrote:
>
> limit and jiffies are unsigned so the test did not work.
>
> Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
> ---
> Found using coccinelle: http://coccinelle.lip6.fr/
>
> >> - for (i = 0; i < 32768 && (limit-jiffies >= 0); i++)
> >> + for (i = 0; i < 32768 && (limit >= jiffies); i++)
> >
> > No, it should use time_after_eq(limit, jiffies) instead.
> >
> >
> > thanks,
> >
> > Takashi
> >
>
> Ok,
Applied now. Thanks.
Takashi
>
> 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)
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-12-17 11:36 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-15 22:06 [PATCH] sound/oss/pss: Fix test of unsigned in pss_reset_dsp() and pss_download_boot() Roel Kluin
2009-12-16 12:00 ` Takashi Iwai
2009-12-16 15:54 ` Roel Kluin
2009-12-17 11:36 ` [alsa-devel] " Takashi Iwai
2009-12-17 0:23 ` Troy Kisky
2009-12-17 6:47 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox