提交 8b551785 编写于 作者: H Harvey Harrison 提交者: Takashi Iwai

[ALSA] sound: patch_sigmatel.c fix shadowed variable warning

Temp variable in the loop shadows the second argument (which is otherwise
unused in this function).  Change this to defcfg as it is used to hold
the default config.
sound/pci/hda/patch_sigmatel.c:2759:18: warning: symbol 'cfg' shadows an earlier one
sound/pci/hda/patch_sigmatel.c:2734:26: originally declared here
Signed-off-by: NHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: NTakashi Iwai <tiwai@suse.de>
上级 0b76b51e
...@@ -2849,11 +2849,11 @@ static int stac9200_auto_create_lfe_ctls(struct hda_codec *codec, ...@@ -2849,11 +2849,11 @@ static int stac9200_auto_create_lfe_ctls(struct hda_codec *codec,
if (lfe_pin == 0 && spec->autocfg.speaker_outs == 0) { if (lfe_pin == 0 && spec->autocfg.speaker_outs == 0) {
for (i = 0; i < spec->autocfg.line_outs && lfe_pin == 0x0; i++) { for (i = 0; i < spec->autocfg.line_outs && lfe_pin == 0x0; i++) {
hda_nid_t pin = spec->autocfg.line_out_pins[i]; hda_nid_t pin = spec->autocfg.line_out_pins[i];
unsigned long cfg; unsigned long defcfg;
cfg = snd_hda_codec_read(codec, pin, 0, defcfg = snd_hda_codec_read(codec, pin, 0,
AC_VERB_GET_CONFIG_DEFAULT, AC_VERB_GET_CONFIG_DEFAULT,
0x00); 0x00);
if (get_defcfg_device(cfg) == AC_JACK_SPEAKER) { if (get_defcfg_device(defcfg) == AC_JACK_SPEAKER) {
unsigned long wcaps = get_wcaps(codec, pin); unsigned long wcaps = get_wcaps(codec, pin);
wcaps &= (AC_WCAP_STEREO | AC_WCAP_OUT_AMP); wcaps &= (AC_WCAP_STEREO | AC_WCAP_OUT_AMP);
if (wcaps == AC_WCAP_OUT_AMP) if (wcaps == AC_WCAP_OUT_AMP)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册