diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2013-11-11 10:34:03 -0600 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2013-11-11 10:34:03 -0600 |
| commit | febbb25c8856bfe03e2a06b3f88e69f7d9d10b81 (patch) | |
| tree | b89154f29c52cf14fcef442ea4df3164e62dd7a6 /sound/pci/hda/hda_generic.c | |
| parent | 5765ecb5ef2401f7bd0feaeeadbe6dbc558b9791 (diff) | |
| parent | 4e77f7f1261f65cff06918bc5e66d02a418fc842 (diff) | |
Merge tag 'v3.10.18' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-lnglinux-lng-3.10.18-2013.11
This is the 3.10.18 stable release
Diffstat (limited to 'sound/pci/hda/hda_generic.c')
| -rw-r--r-- | sound/pci/hda/hda_generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index ad22decad02b..2519f9d03c0f 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c @@ -3474,7 +3474,7 @@ static int create_capture_mixers(struct hda_codec *codec) if (!multi) err = create_single_cap_vol_ctl(codec, n, vol, sw, inv_dmic); - else if (!multi_cap_vol) + else if (!multi_cap_vol && !inv_dmic) err = create_bind_cap_vol_ctl(codec, n, vol, sw); else err = create_multi_cap_vol_ctl(codec); |