From a5c6bedf102023e709cf5ca08564bd208ee86042 Mon Sep 17 00:00:00 2001 From: Timo Juhani Lindfors Date: Thu, 17 Nov 2011 02:52:50 +0200 Subject: [PATCH] --- yaml --- r: 275988 b: refs/heads/master c: 2391a0e06789a3f1718dee30b282562f7ed28c87 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8753.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8b3c5ecab337..f65deaa1df70 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f768a7235d3dfb6f4833030a95a06419df089cb +refs/heads/master: 2391a0e06789a3f1718dee30b282562f7ed28c87 diff --git a/trunk/sound/soc/codecs/wm8753.c b/trunk/sound/soc/codecs/wm8753.c index a9504710bb69..3a629d0d690e 100644 --- a/trunk/sound/soc/codecs/wm8753.c +++ b/trunk/sound/soc/codecs/wm8753.c @@ -190,6 +190,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 0; + if (codec->active) return -EBUSY;