commit b2d7f13dcf4ce9d743bf359ef0ed1ab93979a7ca
author Linux Build Service Account <lnxbuild@localhost> Mon Jul 23 20:07:45 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Mon Jul 23 20:07:45 2012 -0700
tree d2cc5b09a2234d3d443c23b514836c9752c89fb9
parent 33fe201ab6f8cfdac9314516352aa3be552dfcc4
parent 4bd389429e2a6d78d756edd99814fcfdc0450836

Merge "ASoC: wcd9310: Clear the status only for active slimbus ports" into msm-3.4

sound/soc/codecs/wcd9310.c

diff --git a/sound/soc/codecs/wcd9310.c b/sound/soc/codecs/wcd9310.c
index 3164a9b..68892c1 100644
--- a/sound/soc/codecs/wcd9310.c
+++ b/sound/soc/codecs/wcd9310.c
@@ -7312,14 +7312,13 @@
 }
 EXPORT_SYMBOL_GPL(tabla_hs_detect);
 
-static unsigned long slimbus_value;
-
 static irqreturn_t tabla_slimbus_irq(int irq, void *data)
 {
 	struct tabla_priv *priv = data;
 	struct snd_soc_codec *codec = priv->codec;
 	struct tabla_priv *tabla_p = snd_soc_codec_get_drvdata(codec);
 	int i, j, port_id, k, ch_mask_temp;
+	unsigned long slimbus_value;
 	u8 val;
 
 	for (i = 0; i < WCD9XXX_SLIM_NUM_PORT_REG; i++) {
@@ -7352,7 +7351,8 @@
 			}
 		}
 		wcd9xxx_interface_reg_write(codec->control_data,
-			TABLA_SLIM_PGD_PORT_INT_CLR0 + i, 0xFF);
+			TABLA_SLIM_PGD_PORT_INT_CLR0 + i, slimbus_value);
+		val = 0x0;
 	}
 
 	return IRQ_HANDLED;