* ASoC: uninitialized variable i used in wait_for_dc_servo
@ 2011-09-15 2:52 Axel Lin
2011-09-15 9:54 ` Mark Brown
0 siblings, 1 reply; 3+ messages in thread
From: Axel Lin @ 2011-09-15 2:52 UTC (permalink / raw)
To: linux-kernel; +Cc: alsa-devel, Liam Girdwood, Mark Brown
hi Mark,
I guess we need to initialize i to timeout value. comments?
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c
index e5e4607..5aee9cb 100644
--- a/sound/soc/codecs/wm8996.c
+++ b/sound/soc/codecs/wm8996.c
@@ -713,6 +713,7 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec, u16 mask)
snd_soc_write(codec, WM8996_DC_SERVO_2, mask);
/* Use the interrupt if possible */
+ i = timeout;
do {
if (i2c->irq) {
timeout = wait_for_completion_timeout(&wm8996->dcs_done,
@@ -722,7 +723,7 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec, u16 mask)
} else {
msleep(1);
- if (--i) {
+ if (--i == 0) {
timeout = 0;
break;
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: ASoC: uninitialized variable i used in wait_for_dc_servo
2011-09-15 2:52 ASoC: uninitialized variable i used in wait_for_dc_servo Axel Lin
@ 2011-09-15 9:54 ` Mark Brown
2011-09-15 11:13 ` Axel Lin
0 siblings, 1 reply; 3+ messages in thread
From: Mark Brown @ 2011-09-15 9:54 UTC (permalink / raw)
To: Axel Lin; +Cc: linux-kernel, alsa-devel, Liam Girdwood
On Thu, Sep 15, 2011 at 10:52:34AM +0800, Axel Lin wrote:
> @@ -722,7 +723,7 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec, u16 mask)
>
> } else {
> msleep(1);
> - if (--i) {
> + if (--i == 0) {
You should avoid making random stylistic changes that aren't needed when
doing things like this.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: ASoC: uninitialized variable i used in wait_for_dc_servo
2011-09-15 9:54 ` Mark Brown
@ 2011-09-15 11:13 ` Axel Lin
0 siblings, 0 replies; 3+ messages in thread
From: Axel Lin @ 2011-09-15 11:13 UTC (permalink / raw)
To: Mark Brown; +Cc: linux-kernel, alsa-devel, Liam Girdwood
2011/9/15 Mark Brown <broonie@opensource.wolfsonmicro.com>:
> On Thu, Sep 15, 2011 at 10:52:34AM +0800, Axel Lin wrote:
>> @@ -722,7 +723,7 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec, u16 mask)
>>
>> } else {
>> msleep(1);
>> - if (--i) {
>> + if (--i == 0) {
>
> You should avoid making random stylistic changes that aren't needed when
> doing things like this.
>
Ah. I didn't mean to change the coding style.
It's to reverse the logic of the if condition.
BTW, your fix looks good to me.
Regards,
Axel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-09-15 11:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-15 2:52 ASoC: uninitialized variable i used in wait_for_dc_servo Axel Lin
2011-09-15 9:54 ` Mark Brown
2011-09-15 11:13 ` Axel Lin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox