projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linus
[linux-2.6-block.git]
/
sound
/
soc
/
soc-core.c
diff --git
a/sound/soc/soc-core.c
b/sound/soc/soc-core.c
index 0af3bbde5bbe30f0cb359050d131f27ae1a55859..16c7453f494691cd3f75b6d6fe4ef5b45c339c84 100644
(file)
--- 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)