aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/pci/hda/patch_sigmatel.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 3bf528d8fc22..e1d61a035bab 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -2838,7 +2838,7 @@ static int stac9200_auto_create_lfe_ctls(struct hda_codec *codec,
2838 */ 2838 */
2839 for (i = 0; i < spec->autocfg.speaker_outs && lfe_pin == 0x0; i++) { 2839 for (i = 0; i < spec->autocfg.speaker_outs && lfe_pin == 0x0; i++) {
2840 hda_nid_t pin = spec->autocfg.speaker_pins[i]; 2840 hda_nid_t pin = spec->autocfg.speaker_pins[i];
2841 unsigned long wcaps = get_wcaps(codec, pin); 2841 unsigned int wcaps = get_wcaps(codec, pin);
2842 wcaps &= (AC_WCAP_STEREO | AC_WCAP_OUT_AMP); 2842 wcaps &= (AC_WCAP_STEREO | AC_WCAP_OUT_AMP);
2843 if (wcaps == AC_WCAP_OUT_AMP) 2843 if (wcaps == AC_WCAP_OUT_AMP)
2844 /* found a mono speaker with an amp, must be lfe */ 2844 /* found a mono speaker with an amp, must be lfe */
@@ -2849,12 +2849,12 @@ static int stac9200_auto_create_lfe_ctls(struct hda_codec *codec,
2849 if (lfe_pin == 0 && spec->autocfg.speaker_outs == 0) { 2849 if (lfe_pin == 0 && spec->autocfg.speaker_outs == 0) {
2850 for (i = 0; i < spec->autocfg.line_outs && lfe_pin == 0x0; i++) { 2850 for (i = 0; i < spec->autocfg.line_outs && lfe_pin == 0x0; i++) {
2851 hda_nid_t pin = spec->autocfg.line_out_pins[i]; 2851 hda_nid_t pin = spec->autocfg.line_out_pins[i];
2852 unsigned long defcfg; 2852 unsigned int defcfg;
2853 defcfg = snd_hda_codec_read(codec, pin, 0, 2853 defcfg = snd_hda_codec_read(codec, pin, 0,
2854 AC_VERB_GET_CONFIG_DEFAULT, 2854 AC_VERB_GET_CONFIG_DEFAULT,
2855 0x00); 2855 0x00);
2856 if (get_defcfg_device(defcfg) == AC_JACK_SPEAKER) { 2856 if (get_defcfg_device(defcfg) == AC_JACK_SPEAKER) {
2857 unsigned long wcaps = get_wcaps(codec, pin); 2857 unsigned int wcaps = get_wcaps(codec, pin);
2858 wcaps &= (AC_WCAP_STEREO | AC_WCAP_OUT_AMP); 2858 wcaps &= (AC_WCAP_STEREO | AC_WCAP_OUT_AMP);
2859 if (wcaps == AC_WCAP_OUT_AMP) 2859 if (wcaps == AC_WCAP_OUT_AMP)
2860 /* found a mono speaker with an amp, 2860 /* found a mono speaker with an amp,