From: Mark Brown <broonie@kernel.org>
Date: Fri, 13 May 2016 13:26:35 +0000 (+0100)
Subject: Merge remote-tracking branches 'asoc/topic/adsp', 'asoc/topic/ak4624', 'asoc/topic... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3b15d43bdf9f51c81701663f35db57e10543f405;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge remote-tracking branches 'asoc/topic/adsp', 'asoc/topic/ak4624', 'asoc/topic/atmel' and 'asoc/topic/au1x' into asoc-next
---

3b15d43bdf9f51c81701663f35db57e10543f405
diff --cc sound/soc/codecs/cs47l24.c
index 00e9b6fc1b5c,e42ba0634634,576087bda330,576087bda330,576087bda330..5ec5a682d186
--- a/sound/soc/codecs/cs47l24.c
+++ b/sound/soc/codecs/cs47l24.c
@@@@@@ -1041,10 -1067,16 -1041,10 -1041,10 -1041,10 +1067,16 @@@@@@ static irqreturn_t cs47l24_adsp2_irq(in
     {
     	struct cs47l24_priv *priv = data;
     	struct arizona *arizona = priv->core.arizona;
- ---	int ret;
+ +++	int serviced = 0;
+ +++	int i, ret;
  +++
-    	ret = wm_adsp_compr_handle_irq(&priv->core.adsp[2]);
-    	if (ret == -ENODEV) {
+ +++	for (i = 1; i <= 2; ++i) {
+ +++		ret = wm_adsp_compr_handle_irq(&priv->core.adsp[i]);
+ +++		if (ret != -ENODEV)
+ +++			serviced++;
+ +++	}
+    
  ---	ret = wm_adsp_compr_handle_irq(&priv->core.adsp[2]);
  ---	if (ret == -ENODEV) {
+ +++	if (!serviced) {
     		dev_err(arizona->dev, "Spurious compressed data IRQ\n");
     		return IRQ_NONE;
     	}