From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 9 Aug 2012 15:40:46 +0000 (+0200)
Subject: ALSA: hda - Fix forgotten ifdef CONFIG_SND_HDA_PATCH_LOADER
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=97c6a3d17b978092d0df94d5d68dbfc7c74f0902;p=linux.git

ALSA: hda - Fix forgotten ifdef CONFIG_SND_HDA_PATCH_LOADER

The firmware callback must be protected by that ifdef.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 3de3a5cbf1dce..23ad7e216a6be 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -3159,6 +3159,7 @@ static void power_down_all_codecs(struct azx *chip)
 #endif
 }
 
+#ifdef CONFIG_SND_HDA_PATCH_LOADER
 /* callback from request_firmware_nowait() */
 static void azx_firmware_cb(const struct firmware *fw, void *context)
 {
@@ -3183,6 +3184,7 @@ static void azx_firmware_cb(const struct firmware *fw, void *context)
 	snd_card_free(card);
 	pci_set_drvdata(pci, NULL);
 }
+#endif
 
 static int __devinit azx_probe(struct pci_dev *pci,
 			       const struct pci_device_id *pci_id)