Skip to contentSkip to conversation

sound: patch_sigmatel.c fix shadowed variable warning

PATCH Applied Harvey Harrison 2 participants 2 messages Feb 29, 2008 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 2/3 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

---
 sound/pci/hda/patch_sigmatel.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
sound/pci/hda/patch_sigmatel.c +3 -3
index 2912047..6a7f508 100644
@@ -2757,11 +2757,11 @@ 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 cfg;
-			cfg = snd_hda_codec_read(codec, pin, 0,
+			unsigned long defcfg;
+			defcfg = snd_hda_codec_read(codec, pin, 0,
 						 AC_VERB_GET_CONFIG_DEFAULT,
 						 0x00);
-			if (get_defcfg_device(cfg) == AC_JACK_SPEAKER) {
+			if (get_defcfg_device(defcfg) == AC_JACK_SPEAKER) {
 				unsigned long wcaps = get_wcaps(codec, pin);
 				wcaps &= (AC_WCAP_STEREO | AC_WCAP_OUT_AMP);
 				if (wcaps == AC_WCAP_OUT_AMP)
Signature · 1 line
1.5.4.3.342.g99e8
Applied
#1 lore raw

At Thu, 28 Feb 2008 16:18:10 -0800,

Quoted 8 lines · Harvey Harrison

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

Thanks, applied to ALSA tree.
(Oh it's using long instead of int - although it's harmless, I'll fix
soon...)

Takashi