summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-jack.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-03-29 20:31:14 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-04-23 17:07:10 +0100
commit3a278a0c65c924950c4744ba451a110998998044 (patch)
treee1d5c018fe738fd435c449b317adcfcfce152727 /sound/soc/soc-jack.c
parentba0a24e7387bb56425da07ed858ada37896ed36a (diff)
downloadlinux-stable-3a278a0c65c924950c4744ba451a110998998044.tar.gz
linux-stable-3a278a0c65c924950c4744ba451a110998998044.tar.bz2
linux-stable-3a278a0c65c924950c4744ba451a110998998044.zip
ASoC: Allow reporting of NULL jacks
Follow the core jack implementation and allow reporting on the status of NULL jacks, avoiding the need to check in detection implementations. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc/soc-jack.c')
-rw-r--r--sound/soc/soc-jack.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
index f8fd22cc70bc..29159e1781d0 100644
--- a/sound/soc/soc-jack.c
+++ b/sound/soc/soc-jack.c
@@ -64,10 +64,9 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
int enable;
int oldstatus;
- if (!jack) {
- WARN_ON_ONCE(!jack);
+ if (!jack)
return;
- }
+
codec = jack->card->codec;
mutex_lock(&codec->mutex);