summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-06-16 12:23:36 +0200
committerTakashi Iwai <tiwai@suse.de>2015-06-16 12:25:41 +0200
commit145c0e914d2cd0cf829b8c4cbe24736b3ee81a91 (patch)
treedbf45bc245aa3a5bc6a261b286b92fff71cf918c
parent82d6d8a4034a7480d582791763c89c328c2a8f0c (diff)
downloadop-kernel-dev-145c0e914d2cd0cf829b8c4cbe24736b3ee81a91.zip
op-kernel-dev-145c0e914d2cd0cf829b8c4cbe24736b3ee81a91.tar.gz
ALSA: hda - Fix unused label skip_i915
When CONFIG_SND_HDA_I915=n, we get a compile warning: sound/pci/hda/hda_intel.c: In function ‘azx_probe_continue’: sound/pci/hda/hda_intel.c:1882:2: warning: label ‘skip_i915’ defined but not used [-Wunused-label] Fix it by putting again ifdef to it. Sigh. Fixes: bf06848bdbe5 ('ALSA: hda - Continue probing even if i915 binding fails') Reported-by: Borislav Petkov <bp@suse.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/hda/hda_intel.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index a244ba7..b6db25b 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1879,7 +1879,9 @@ static int azx_probe_continue(struct azx *chip)
#endif
}
+#ifdef CONFIG_SND_HDA_I915
skip_i915:
+#endif
err = azx_first_init(chip);
if (err < 0)
goto out_free;
OpenPOWER on IntegriCloud