[oe-commits] Klaus Kurzmann : linux-openmoko_2.6.37.bb: allow setting DAI mode even while pcm is active

[git version control]

Module: openembedded.git
Branch: master
Commit: 45edf621296daf150c72b876d720861235e5762e
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=45edf621296daf150c72b876d720861235e5762e

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Thu Jun  9 22:54:21 2011 +0200

linux-openmoko_2.6.37.bb: allow setting DAI mode even while pcm is active

Without this patch the DAI mode can't be set while a pcm stream is
running as that might lead to kernel freezing. This patch allows setting
it to the same value to make scenario loading work.

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 .../linux-2.6.37/gta02-dont-block-dai-switch.patch |   13 +++++++++++++
 recipes/linux/linux-openmoko_2.6.37.bb             |    2 +-
 2 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/recipes/linux/linux-2.6.37/gta02-dont-block-dai-switch.patch b/recipes/linux/linux-2.6.37/gta02-dont-block-dai-switch.patch
new file mode 100644
index 0000000..92742ff
--- /dev/null
+++ b/recipes/linux/linux-2.6.37/gta02-dont-block-dai-switch.patch
@@ -0,0 +1,13 @@
+diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
+index ffa2ffe..a72a716 100644
+--- a/sound/soc/codecs/wm8753.c
++++ b/sound/soc/codecs/wm8753.c
+@@ -189,6 +189,9 @@ static int wm8753_set_dai(struct snd_kcontrol *kcontrol,
+ 	struct wm8753_priv *wm8753 = snd_soc_codec_get_drvdata(codec);
+ 	u16 ioctl;
+ 
++	if (wm8753->dai_func == ucontrol->value.integer.value[0])
++		return 1;
++
+ 	if (codec->active)
+ 		return -EBUSY;
diff --git a/recipes/linux/linux-openmoko_2.6.37.bb b/recipes/linux/linux-openmoko_2.6.37.bb
index 24ba7df..b590306 100644
--- a/recipes/linux/linux-openmoko_2.6.37.bb
+++ b/recipes/linux/linux-openmoko_2.6.37.bb
@@ -1,3 +1,3 @@
 require linux_${PV}.bb
 require linux-openmoko.inc
-OM-PR = "4"
+OM-PR = "5"