Merge remote-tracking branches 'asoc/topic/adsp', 'asoc/topic/ak4624', 'asoc/topic...
authorMark Brown <broonie@kernel.org>
Fri, 13 May 2016 13:26:35 +0000 (14:26 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 13 May 2016 13:26:35 +0000 (14:26 +0100)
1  2  3  4  5 
sound/soc/codecs/arizona.c
sound/soc/codecs/cs47l24.c
sound/soc/codecs/wm5102.c
sound/soc/codecs/wm5110.c

Simple merge
index 00e9b6fc1b5cab0ddf8b4c3d945a3b2ab27dc749,e42ba0634634dbd93b9e7587c53d4d16ba3abd78,576087bda330ce840bdb4f90777ee7c9f1d580d9,576087bda330ce840bdb4f90777ee7c9f1d580d9,576087bda330ce840bdb4f90777ee7c9f1d580d9..5ec5a682d186971daa09d532d0b4627806eecaa3
@@@@@@ -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;
        }
Simple merge
Simple merge