aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-03-03 00:10:02 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-03-04 01:58:36 +0000
commit28e33269a71cb4104c2e0629b6a3ef7344436f93 (patch)
tree1eedb73eb13bce3795c624774df912e6e204c598 /sound/soc/codecs
parentASoC: wm8994: Disable JACKDET when disabling detecton (diff)
downloadlinux-dev-28e33269a71cb4104c2e0629b6a3ef7344436f93.tar.xz
linux-dev-28e33269a71cb4104c2e0629b6a3ef7344436f93.zip
ASoC: wm8994: Don't bother updating the jackdet mode needlessly
If we're not doing jackdet it's not needed. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r--sound/soc/codecs/wm8994.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 6166a5783410..bda5ddbeecb4 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -686,6 +686,9 @@ static void wm1811_jackdet_set_mode(struct snd_soc_codec *codec, u16 mode)
{
struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
+ if (!wm8994->jackdet || !wm8994->jack_cb)
+ return;
+
if (wm8994->active_refcount)
mode = WM1811_JACKDET_MODE_AUDIO;