diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-01-10 10:49:13 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-01-10 10:49:13 +0100 |
| commit | 70c673a48072ff73425b82800479e66f918b8718 (patch) | |
| tree | b8a98710f97ff69c51fa5ba158f403059fd30632 /sound/pci/hda/patch_sigmatel.c | |
| parent | 10528020d7323778b60c2de04754a2615a88d002 (diff) | |
| parent | e03fa055bc126e536c7f65862e08a9b143138ea9 (diff) | |
| download | op-kernel-dev-70c673a48072ff73425b82800479e66f918b8718.zip op-kernel-dev-70c673a48072ff73425b82800479e66f918b8718.tar.gz | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'sound/pci/hda/patch_sigmatel.c')
| -rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 8e2bb0a..6131a92 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -3481,6 +3481,8 @@ static int stac92xx_auto_create_dmic_input_ctls(struct hda_codec *codec, label = hda_get_input_pin_label(codec, nid, 1); snd_hda_add_imux_item(dimux, label, index, &type_idx); + if (snd_hda_get_bool_hint(codec, "separate_dmux") != 1) + snd_hda_add_imux_item(imux, label, index, &type_idx); err = create_elem_capture_vol(codec, nid, label, type_idx, HDA_INPUT); @@ -3492,9 +3494,6 @@ static int stac92xx_auto_create_dmic_input_ctls(struct hda_codec *codec, if (err < 0) return err; } - - if (snd_hda_get_bool_hint(codec, "separate_dmux") != 1) - snd_hda_add_imux_item(imux, label, index, NULL); } return 0; |
