---

yaml
---
r: 132909
b: refs/heads/master
c: cbf1146
h: refs/heads/master
i:
  132907: 29eee83
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 090cec81ae9b4ff0c1d301b722f0e6c5fb72d8f9
+refs/heads/master: cbf1146d5ee113152c5cdeb54ff9d4b2f0c91736

trunk/sound/soc/pxa/pxa-ssp.c

@@ -522,6 +522,17 @@ static int pxa_ssp_set_dai_fmt(struct snd_soc_dai *cpu_dai,
 	u32 sscr1;
 	u32 sspsp;
 
+	/* check if we need to change anything at all */
+	if (priv->dai_fmt == fmt)
+		return 0;
+
+	/* we can only change the settings if the port is not in use */
+	if (ssp_read_reg(ssp, SSCR0) & SSCR0_SSE) {
+		dev_err(&ssp->pdev->dev,
+			"can't change hardware dai format: stream is in use");
+		return -EINVAL;
+	}
+
 	/* reset port settings */
 	sscr0 = ssp_read_reg(ssp, SSCR0) &
 		(SSCR0_ECS |  SSCR0_NCS | SSCR0_MOD | SSCR0_ACS);