Skip to contentSkip to conversation

ASoC: wm2000: a couple harmless underflows

PATCH In review Dan Carpenter 3 participants 3 messages Oct 13, 2015 – Oct 22, 2015

Subsystems (4)
Sound Kernel janitors ASoC Wolfson microelectronics drivers
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 ASoC: wm2000: a couple harmless underflows

We want these to be zero or one, but by mistake we also accept negative values. It's harmless but we should still clean it up.

Signed-off-by Dan Carpenter <[email protected]>
sound/soc/codecs/wm2000.c +2 -2
index 786abd0..a67ea10 100644
@@ -620,7 +620,7 @@ static int wm2000_anc_mode_put(struct snd_kcontrol *kcontrol,
 {
 	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
 	struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);
-	int anc_active = ucontrol->value.integer.value[0];
+	unsigned int anc_active = ucontrol->value.integer.value[0];
 	int ret;
 
 	if (anc_active > 1)

@@ -653,7 +653,7 @@ static int wm2000_speaker_put(struct snd_kcontrol *kcontrol,
 {
 	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
 	struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);
-	int val = ucontrol->value.integer.value[0];
+	unsigned int val = ucontrol->value.integer.value[0];
 	int ret;
 
 	if (val > 1)
maintainer
#2 lore raw

Applied "ASoC: wm2000: a couple harmless underflows" to the asoc tree

In reply to Dan Carpenter

The patch

ASoC: wm2000: a couple harmless underflows

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

Quoted 1 line

From 8444f59fd7bd8aa079609e575c0688669b85bfcc Mon Sep 17 00:00:00 2001

From: Dan Carpenter <[email protected]>
Date: Tue, 13 Oct 2015 10:12:45 +0300
Subject: [PATCH] ASoC: wm2000: a couple harmless underflows

We want these to be zero or one, but by mistake we also accept negative values. It's harmless but we should still clean it up.

Signed-off-by Dan Carpenter <[email protected]>
Acked-by Charles Keepax <[email protected]>
Signed-off-by Mark Brown <[email protected]>
---
 sound/soc/codecs/wm2000.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/wm2000.c +2 -2
index 786abd0..a67ea10 100644
@@ -620,7 +620,7 @@ static int wm2000_anc_mode_put(struct snd_kcontrol *kcontrol,
 {
 	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
 	struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);
-	int anc_active = ucontrol->value.integer.value[0];
+	unsigned int anc_active = ucontrol->value.integer.value[0];
 	int ret;
 
 	if (anc_active > 1)

@@ -653,7 +653,7 @@ static int wm2000_speaker_put(struct snd_kcontrol *kcontrol,
 {
 	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
 	struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);
-	int val = ucontrol->value.integer.value[0];
+	unsigned int val = ucontrol->value.integer.value[0];
 	int ret;
 
 	if (val > 1)
Signature · 1 line
2.6.1