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

Fix a build error when CONFIG_SND_HDA_PATCH_LOADER isn't set.

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)