[alsa-devel] ASoC: uninitialized variable i used in wait_for_dc_servo
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; }
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.
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
participants (2)
-
Axel Lin
-
Mark Brown