redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

Merge branch 'topic/hda-probe-defer' into for-next

Browse source 
Fix a build error when CONFIG_SND_HDA_PATCH_LOADER isn't set.
This commit is contained in:
Takashi Iwai 2012-08-09 17:41:44 +02:00
parent 5f1890897c 97c6a3d17b
commit 7b03d1d9c0
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
}
#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)