asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ALSA: hda - Fix forgotten ifdef CONFIG_SND_HDA_PATCH_LOADER

Browse source 
The firmware callback must be protected by that ifdef.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2012-08-09 17:40:46 +02:00
parent 5cb543dba9
commit 97c6a3d17b
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sound/pci/hda/hda_intel.c
View file

@ -3159,6 +3159,7 @@ static void power_down_all_codecs(struct azx *chip)
#endif #endif
} }
#ifdef CONFIG_SND_HDA_PATCH_LOADER
/* callback from request_firmware_nowait() */ /* callback from request_firmware_nowait() */
static void azx_firmware_cb(const struct firmware *fw, void *context) 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); snd_card_free(card);
pci_set_drvdata(pci, NULL); pci_set_drvdata(pci, NULL);
} }
#endif
static int __devinit azx_probe(struct pci_dev *pci, static int __devinit azx_probe(struct pci_dev *pci,
const struct pci_device_id *pci_id) const struct pci_device_id *pci_id)