summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_intel.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-08-09 17:40:46 +0200
committerTakashi Iwai <tiwai@suse.de>2012-08-09 17:41:01 +0200
commit97c6a3d17b978092d0df94d5d68dbfc7c74f0902 (patch)
treeacf812a14cedd360821e400a9139b0c8d999a405 /sound/pci/hda/hda_intel.c
parent5cb543dba9867588786f87af2e64fca371b69283 (diff)
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>
Diffstat (limited to 'sound/pci/hda/hda_intel.c')
-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 3de3a5cbf1d..23ad7e216a6 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)