diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2012-08-09 17:40:46 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-08-09 17:41:01 +0200 |
| commit | 97c6a3d17b978092d0df94d5d68dbfc7c74f0902 (patch) | |
| tree | acf812a14cedd360821e400a9139b0c8d999a405 /sound | |
| parent | ALSA: hda - Deferred probing with request_firmware_nowait() (diff) | |
| download | linux-dev-97c6a3d17b978092d0df94d5d68dbfc7c74f0902.tar.xz linux-dev-97c6a3d17b978092d0df94d5d68dbfc7c74f0902.zip | |
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')
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 3de3a5cbf1dc..23ad7e216a6b 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) |