---

yaml --- r: 353401 b: refs/heads/master c: 2d77828 h: refs/heads/master i: 353399: 6ce5e55 v: v3
git-mirror · Jan 26, 2013 · d778e6c · d778e6c
1 parent 2ba8513
commit d778e6c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c62eebbf7d1cdaec68ab9d2d4017007f9312391
+refs/heads/master: 2d77828d9904494d3c7424189ee38cc07950df5e
diff --git a/trunk/sound/soc/samsung/i2s.c b/trunk/sound/soc/samsung/i2s.c
@@ -656,6 +656,9 @@ static int i2s_startup(struct snd_pcm_substream *substream,
 	/* Enforce set_sysclk in Master mode */
 	i2s->rclk_srcrate = 0;
 
+	if (!any_active(i2s) && (i2s->quirks & QUIRK_NEED_RSTCLR))
+		writel(CON_RSTCLR, i2s->addr + I2SCON);
+
 	spin_unlock_irqrestore(&lock, flags);
 
 	return 0;