Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6

[cascardo/linux.git] / sound / soc / codecs / 88pm860x-codec.c

diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c
index 08e15de..06b6981 100644 (file)
--- a/sound/soc/codecs/88pm860x-codec.c
+++ b/sound/soc/codecs/88pm860x-codec.c
@@ -22,6 +22,7 @@
 #include <sound/tlv.h>
 #include <sound/initval.h>
 #include <sound/jack.h>
+#include <trace/events/asoc.h>
 
 #include "88pm860x-codec.h"
 
@@ -145,7 +146,6 @@ struct pm860x_priv {
 
        int                     irq[4];
        unsigned char           name[4][MAX_NAME_LEN];
-       unsigned char           reg_cache[REG_CACHE_SIZE];
 };
 
 /* -9450dB to 0dB in 150dB steps ( mute instead of -9450dB) */
@@ -1262,6 +1262,12 @@ static irqreturn_t pm860x_codec_handler(int irq, void *data)
        mask = pm860x->det.hs_shrt | pm860x->det.hook_det | pm860x->det.lo_shrt
                | pm860x->det.hp_det;
 
+#ifndef CONFIG_SND_SOC_88PM860X_MODULE
+       if (status & (HEADSET_STATUS | MIC_STATUS | SHORT_HS1 | SHORT_HS2 |
+                     SHORT_LO1 | SHORT_LO2))
+               trace_snd_soc_jack_irq(dev_name(pm860x->codec->dev));
+#endif
+
        if ((pm860x->det.hp_det & SND_JACK_HEADPHONE)
                && (status & HEADSET_STATUS))
                report |= SND_JACK_HEADPHONE;