aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-07-15 06:13:58 -0400
committerMark Brown <broonie@linaro.org>2013-07-15 06:13:58 -0400
commit4824b69a928b6609cfb1cf232ef32d4a8125a371 (patch)
treedb8ddb2b2635a46af82b013638d33baf870f755e /sound
parent1052e144cc59b06fe7b104da2a0187c3ea431f76 (diff)
parent82e414fa1dbbc07e7b6d582e4fbcc9b0a5299f7f (diff)
Merge remote-tracking branch 'asoc/fix/wm8994' into asoc-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8994.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 1d4b1ec66e36..ba832b77c543 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -3852,8 +3852,6 @@ static void wm8958_mic_work(struct work_struct *work)
3852 mic_complete_work.work); 3852 mic_complete_work.work);
3853 struct snd_soc_codec *codec = wm8994->hubs.codec; 3853 struct snd_soc_codec *codec = wm8994->hubs.codec;
3854 3854
3855 dev_crit(codec->dev, "MIC WORK %x\n", wm8994->mic_status);
3856
3857 pm_runtime_get_sync(codec->dev); 3855 pm_runtime_get_sync(codec->dev);
3858 3856
3859 mutex_lock(&wm8994->accdet_lock); 3857 mutex_lock(&wm8994->accdet_lock);
@@ -3863,8 +3861,6 @@ static void wm8958_mic_work(struct work_struct *work)
3863 mutex_unlock(&wm8994->accdet_lock); 3861 mutex_unlock(&wm8994->accdet_lock);
3864 3862
3865 pm_runtime_put(codec->dev); 3863 pm_runtime_put(codec->dev);
3866
3867 dev_crit(codec->dev, "MIC WORK %x DONE\n", wm8994->mic_status);
3868} 3864}
3869 3865
3870static irqreturn_t wm8958_mic_irq(int irq, void *data) 3866static irqreturn_t wm8958_mic_irq(int irq, void *data)