projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5cb543d
)
ALSA: hda - Fix forgotten ifdef CONFIG_SND_HDA_PATCH_LOADER
author
Takashi Iwai
<tiwai@suse.de>
Thu, 9 Aug 2012 15:40:46 +0000
(17:40 +0200)
committer
Takashi Iwai
<tiwai@suse.de>
Thu, 9 Aug 2012 15:41:01 +0000
(17:41 +0200)
The firmware callback must be protected by that ifdef.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/hda_intel.c
patch
|
blob
|
history
diff --git
a/sound/pci/hda/hda_intel.c
b/sound/pci/hda/hda_intel.c
index 3de3a5cbf1dced0b1a2408d22bfb945278bc555e..23ad7e216a6be315dcd935156ac41a5d09565e11 100644
(file)
--- 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)