aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-02-29 05:56:48 -0500
committerTakashi Iwai <tiwai@suse.de>2008-04-24 06:00:19 -0400
commit8b55178515e8872670dc830203dad0e9e51e16be (patch)
tree2871d4bf930bf8548fa5de12d1908337c3782c69
parent0b76b51e5807951995a39ea791b39971a7ae945f (diff)
[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: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-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 4bc7d8646fab..3bf528d8fc22 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -2849,11 +2849,11 @@ 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 cfg; 2852 unsigned long defcfg;
2853 cfg = 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(cfg) == AC_JACK_SPEAKER) { 2856 if (get_defcfg_device(defcfg) == AC_JACK_SPEAKER) {
2857 unsigned long wcaps = get_wcaps(codec, pin); 2857 unsigned long 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)