diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-10-31 09:39:49 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-10-31 09:39:49 -0400 |
| commit | 04172c0b9ea5861e5cba7909da5297b3aedac9e1 (patch) | |
| tree | 5a993adb827ae676166ad11f7510ff57ebda46b8 /sound/soc/soc-core.c | |
| parent | 5b99e6ccf964e733f0afe2b7bd09559a51a540ca (diff) | |
| parent | 13d622b33dfbd99205a7add5751ba47445e480a6 (diff) | |
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 8f384df941fd..1a173682965a 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, | |||
| 1555 | struct soc_mixer_control *mc = | 1555 | struct soc_mixer_control *mc = |
| 1556 | (struct soc_mixer_control *)kcontrol->private_value; | 1556 | (struct soc_mixer_control *)kcontrol->private_value; |
| 1557 | int max = mc->max; | 1557 | int max = mc->max; |
| 1558 | unsigned int shift = mc->min; | 1558 | unsigned int shift = mc->shift; |
| 1559 | unsigned int rshift = mc->rshift; | 1559 | unsigned int rshift = mc->rshift; |
| 1560 | 1560 | ||
| 1561 | if (max == 1) | 1561 | if (max == 1) |