From c349739e25fa551843b8163581b63b3ab9eee2d9 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 11 Feb 2013 14:18:29 +0100 Subject: [PATCH] --- yaml --- r: 353473 b: refs/heads/master c: f664417e23192087bb9bdafdff80e04104994cc0 h: refs/heads/master i: 353471: cb8f75778e2c9f8d01ec853d8450c995ff12b592 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_ca0132.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 66dad941350c..e91b4f8c93e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83048ea7b1d11f5e560dea53873fb51d860202eb +refs/heads/master: f664417e23192087bb9bdafdff80e04104994cc0 diff --git a/trunk/sound/pci/hda/patch_ca0132.c b/trunk/sound/pci/hda/patch_ca0132.c index fb7a32e730af..b1e099a3369c 100644 --- a/trunk/sound/pci/hda/patch_ca0132.c +++ b/trunk/sound/pci/hda/patch_ca0132.c @@ -2615,6 +2615,7 @@ static int dspload_image(struct hda_codec *codec, return status; } +#ifdef CONFIG_SND_HDA_CODEC_CA0132_DSP static bool dspload_is_loaded(struct hda_codec *codec) { unsigned int data = 0; @@ -2626,6 +2627,9 @@ static bool dspload_is_loaded(struct hda_codec *codec) return true; } +#else +#define dspload_is_loaded(codec) false +#endif static bool dspload_wait_loaded(struct hda_codec *codec) {