diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-08-24 10:56:06 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-08-24 10:56:06 +0200 |
| commit | a301fed4b91dca95b64d9689480421aac9d79e3a (patch) | |
| tree | ac8d2c3574616f581b488da93162e37336b8b044 | |
| parent | 5e8e1a9b05ccad82ac48cf63c8f96ff42f53f561 (diff) | |
| parent | 7675535958175b85b8117bcee245d9ecbc4d3d74 (diff) | |
| download | linux-3.10-a301fed4b91dca95b64d9689480421aac9d79e3a.tar.gz linux-3.10-a301fed4b91dca95b64d9689480421aac9d79e3a.tar.bz2 linux-3.10-a301fed4b91dca95b64d9689480421aac9d79e3a.zip | |
Merge branch 'fix/hda' into topic/hda
| -rw-r--r-- | sound/pci/hda/patch_conexant.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 4c462c3d646..5616444a8ed 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -3866,7 +3866,7 @@ static void cx_auto_parse_input(struct hda_codec *codec) } if (imux->num_items >= 2 && cfg->num_inputs == imux->num_items) cx_auto_check_auto_mic(codec); - if (imux->num_items > 1 && !spec->auto_mic) { + if (imux->num_items > 1) { for (i = 1; i < imux->num_items; i++) { if (spec->imux_info[i].adc != spec->imux_info[0].adc) { spec->adc_switching = 1; |