2016-10-13 08:50:45

by Dan Carpenter

Subject: [patch] ASoC: rt5663: fix a debug statement

We increment "i" before printing the debug statement. That makes it
the wrong sleep_time[] information and Smatch complains that the last
increment could be beyond the end of the array.

Signed-off-by: Dan Carpenter <[email protected]>

diff --git a/sound/soc/codecs/rt5663.c b/sound/soc/codecs/rt5663.c
index 01a18d8..00ff278 100644
--- a/sound/soc/codecs/rt5663.c
+++ b/sound/soc/codecs/rt5663.c
@@ -1547,11 +1547,11 @@ static int rt5663_jack_detect(struct snd_soc_codec *codec, int jack_insert)
msleep(sleep_time[i]);
val = snd_soc_read(codec, RT5663_EM_JACK_TYPE_2) &
0x0003;
+ dev_dbg(codec->dev, "%s: MX-00e7 val=%x sleep %d\n",
+ __func__, val, sleep_time[i]);
i++;
if (val == 0x1 || val == 0x2 || val == 0x3)
break;
- dev_dbg(codec->dev, "%s: MX-00e7 val=%x sleep %d\n",
- __func__, val, sleep_time[i]);
}
dev_dbg(codec->dev, "%s val = %d\n", __func__, val);
switch (val) {

2016-10-13 09:16:13

by Bard Liao

Subject: RE: [patch] ASoC: rt5663: fix a debug statement

> -----Original Message-----
> From: Dan Carpenter [mailto:[email protected]]
> Sent: Thursday, October 13, 2016 4:47 PM
> To: Bard Liao
> Cc: Oder Chiou; Liam Girdwood; Mark Brown; Jaroslav Kysela; Takashi Iwai;
> [email protected]; [email protected];
> [email protected]
> Subject: [patch] ASoC: rt5663: fix a debug statement
>
> We increment "i" before printing the debug statement. That makes it the
> wrong sleep_time[] information and Smatch complains that the last increment
> could be beyond the end of the array.
>
> Signed-off-by: Dan Carpenter <[email protected]>
>
Acked-by: Bard Liao <[email protected]>

2016-10-20 17:13:56

by Mark Brown

Subject: Applied "ASoC: rt5663: fix a debug statement" to the asoc tree

The patch

ASoC: rt5663: fix a debug statement

has been applied to the asoc tree at

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

>From c975e39ccadf6dc047356c60773a043a2293b8cd Mon Sep 17 00:00:00 2001
From: Dan Carpenter <[email protected]>
Date: Thu, 13 Oct 2016 11:47:13 +0300
Subject: [PATCH] ASoC: rt5663: fix a debug statement

We increment "i" before printing the debug statement. That makes it
the wrong sleep_time[] information and Smatch complains that the last
increment could be beyond the end of the array.

Signed-off-by: Dan Carpenter <[email protected]>
Acked-by: Bard Liao <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
---
sound/soc/codecs/rt5663.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/rt5663.c b/sound/soc/codecs/rt5663.c
index 01a18d88f1eb..00ff2788879e 100644
--- a/sound/soc/codecs/rt5663.c
+++ b/sound/soc/codecs/rt5663.c
@@ -1547,11 +1547,11 @@ static int rt5663_jack_detect(struct snd_soc_codec *codec, int jack_insert)
msleep(sleep_time[i]);
val = snd_soc_read(codec, RT5663_EM_JACK_TYPE_2) &
0x0003;
+ dev_dbg(codec->dev, "%s: MX-00e7 val=%x sleep %d\n",
+ __func__, val, sleep_time[i]);
i++;
if (val == 0x1 || val == 0x2 || val == 0x3)
break;
- dev_dbg(codec->dev, "%s: MX-00e7 val=%x sleep %d\n",
- __func__, val, sleep_time[i]);
}
dev_dbg(codec->dev, "%s val = %d\n", __func__, val);
switch (val) {
--
2.9.3