summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2008-10-30 12:37:08 +0000
committerTakashi Iwai <tiwai@suse.de>2008-10-30 14:24:41 +0100
commit762b8df748d83c14070afbf0c6f8c0f4a91a13bf (patch)
tree47298a6a90cd268e57469b55aec0d8cb8d6ad675 /sound
parentc3e5203bed1999df716e3c7119f6749523eb952f (diff)
downloadlinux-762b8df748d83c14070afbf0c6f8c0f4a91a13bf.tar.gz
linux-762b8df748d83c14070afbf0c6f8c0f4a91a13bf.tar.bz2
linux-762b8df748d83c14070afbf0c6f8c0f4a91a13bf.zip
ALSA: ASoC: Fix mono controls after conversion to support full int masks
When ASoC was converted to support full int width masks SOC_SINGLE_VALUE() omitted the assignment of rshift, causing the control operatins to report some mono controls as stereo. This happened to work some of the time due to a confusion between shift and min in snd_soc_info_volsw(). Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 462e635dfc74..a3adbf06b1e5 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1462,7 +1462,7 @@ int snd_soc_info_volsw(struct snd_kcontrol *kcontrol,
struct soc_mixer_control *mc =
(struct soc_mixer_control *)kcontrol->private_value;
int max = mc->max;
- unsigned int shift = mc->min;
+ unsigned int shift = mc->shift;
unsigned int rshift = mc->rshift;
if (max == 1)