diff options
Diffstat (limited to 'sound/pci/hda/patch_sigmatel.c')
-rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 7901e76f2690..132d1e3eafa5 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
@@ -186,9 +186,6 @@ struct sigmatel_spec { | |||
186 | struct hda_input_mux private_dimux; | 186 | struct hda_input_mux private_dimux; |
187 | struct hda_input_mux private_imux; | 187 | struct hda_input_mux private_imux; |
188 | struct hda_input_mux private_mono_mux; | 188 | struct hda_input_mux private_mono_mux; |
189 | |||
190 | /* virtual master */ | ||
191 | unsigned int vmaster_tlv[4]; | ||
192 | }; | 189 | }; |
193 | 190 | ||
194 | static hda_nid_t stac9200_adc_nids[1] = { | 191 | static hda_nid_t stac9200_adc_nids[1] = { |
@@ -930,10 +927,11 @@ static int stac92xx_build_controls(struct hda_codec *codec) | |||
930 | 927 | ||
931 | /* if we have no master control, let's create it */ | 928 | /* if we have no master control, let's create it */ |
932 | if (!snd_hda_find_mixer_ctl(codec, "Master Playback Volume")) { | 929 | if (!snd_hda_find_mixer_ctl(codec, "Master Playback Volume")) { |
930 | unsigned int vmaster_tlv[4]; | ||
933 | snd_hda_set_vmaster_tlv(codec, spec->multiout.dac_nids[0], | 931 | snd_hda_set_vmaster_tlv(codec, spec->multiout.dac_nids[0], |
934 | HDA_OUTPUT, spec->vmaster_tlv); | 932 | HDA_OUTPUT, vmaster_tlv); |
935 | err = snd_hda_add_vmaster(codec, "Master Playback Volume", | 933 | err = snd_hda_add_vmaster(codec, "Master Playback Volume", |
936 | spec->vmaster_tlv, slave_vols); | 934 | vmaster_tlv, slave_vols); |
937 | if (err < 0) | 935 | if (err < 0) |
938 | return err; | 936 | return err; |
939 | } | 937 | } |