aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-03-29 15:31:14 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-04-23 12:07:10 -0400
commit3a278a0c65c924950c4744ba451a110998998044 (patch)
treee1d5c018fe738fd435c449b317adcfcfce152727 /sound/soc
parentba0a24e7387bb56425da07ed858ada37896ed36a (diff)
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')
-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)
64 int enable; 64 int enable;
65 int oldstatus; 65 int oldstatus;
66 66
67 if (!jack) { 67 if (!jack)
68 WARN_ON_ONCE(!jack);
69 return; 68 return;
70 } 69
71 codec = jack->card->codec; 70 codec = jack->card->codec;
72 71
73 mutex_lock(&codec->mutex); 72 mutex_lock(&codec->mutex);