diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-10-31 14:39:49 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-10-31 14:39:49 +0100 |
| commit | 04172c0b9ea5861e5cba7909da5297b3aedac9e1 (patch) | |
| tree | 5a993adb827ae676166ad11f7510ff57ebda46b8 /sound/soc/soc-core.c | |
| parent | 5b99e6ccf964e733f0afe2b7bd09559a51a540ca (diff) | |
| parent | 13d622b33dfbd99205a7add5751ba47445e480a6 (diff) | |
| download | kernel_samsung_crespo-04172c0b9ea5861e5cba7909da5297b3aedac9e1.zip kernel_samsung_crespo-04172c0b9ea5861e5cba7909da5297b3aedac9e1.tar.gz kernel_samsung_crespo-04172c0b9ea5861e5cba7909da5297b3aedac9e1.tar.bz2 | |
Merge branch 'topic/fix/asoc' into topic/asoc
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 8f384df..1a17368 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1555,7 +1555,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) |