From 36a18af6f55586620cb6c18fac728b335cc9ca7e Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 29 Feb 2008 11:57:53 +0100 Subject: [PATCH] --- yaml --- r: 92097 b: refs/heads/master c: 64ed0dfd1f42edb15f4d18c13d7696edbc2f7e4c h: refs/heads/master i: 92095: fbed604c12d85daf44bf2c41c6eb70d0a19fca6f v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_sigmatel.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index fb2e110d6964..6cbad0eff8f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b55178515e8872670dc830203dad0e9e51e16be +refs/heads/master: 64ed0dfd1f42edb15f4d18c13d7696edbc2f7e4c diff --git a/trunk/sound/pci/hda/patch_sigmatel.c b/trunk/sound/pci/hda/patch_sigmatel.c index 3bf528d8fc22..e1d61a035bab 100644 --- a/trunk/sound/pci/hda/patch_sigmatel.c +++ b/trunk/sound/pci/hda/patch_sigmatel.c @@ -2838,7 +2838,7 @@ static int stac9200_auto_create_lfe_ctls(struct hda_codec *codec, */ for (i = 0; i < spec->autocfg.speaker_outs && lfe_pin == 0x0; i++) { hda_nid_t pin = spec->autocfg.speaker_pins[i]; - unsigned long wcaps = get_wcaps(codec, pin); + unsigned int wcaps = get_wcaps(codec, pin); wcaps &= (AC_WCAP_STEREO | AC_WCAP_OUT_AMP); if (wcaps == AC_WCAP_OUT_AMP) /* 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, if (lfe_pin == 0 && spec->autocfg.speaker_outs == 0) { for (i = 0; i < spec->autocfg.line_outs && lfe_pin == 0x0; i++) { hda_nid_t pin = spec->autocfg.line_out_pins[i]; - unsigned long defcfg; + unsigned int defcfg; defcfg = snd_hda_codec_read(codec, pin, 0, AC_VERB_GET_CONFIG_DEFAULT, 0x00); if (get_defcfg_device(defcfg) == AC_JACK_SPEAKER) { - unsigned long wcaps = get_wcaps(codec, pin); + unsigned int wcaps = get_wcaps(codec, pin); wcaps &= (AC_WCAP_STEREO | AC_WCAP_OUT_AMP); if (wcaps == AC_WCAP_OUT_AMP) /* found a mono speaker with an amp,