diff options
Diffstat (limited to 'sound/soc/codecs/88pm860x-codec.c')
-rw-r--r-- | sound/soc/codecs/88pm860x-codec.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c index 08e15dee918..06b6981b8d6 100644 --- a/sound/soc/codecs/88pm860x-codec.c +++ b/sound/soc/codecs/88pm860x-codec.c | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <sound/tlv.h> | 22 | #include <sound/tlv.h> |
23 | #include <sound/initval.h> | 23 | #include <sound/initval.h> |
24 | #include <sound/jack.h> | 24 | #include <sound/jack.h> |
25 | #include <trace/events/asoc.h> | ||
25 | 26 | ||
26 | #include "88pm860x-codec.h" | 27 | #include "88pm860x-codec.h" |
27 | 28 | ||
@@ -145,7 +146,6 @@ struct pm860x_priv { | |||
145 | 146 | ||
146 | int irq[4]; | 147 | int irq[4]; |
147 | unsigned char name[4][MAX_NAME_LEN]; | 148 | unsigned char name[4][MAX_NAME_LEN]; |
148 | unsigned char reg_cache[REG_CACHE_SIZE]; | ||
149 | }; | 149 | }; |
150 | 150 | ||
151 | /* -9450dB to 0dB in 150dB steps ( mute instead of -9450dB) */ | 151 | /* -9450dB to 0dB in 150dB steps ( mute instead of -9450dB) */ |
@@ -1262,6 +1262,12 @@ static irqreturn_t pm860x_codec_handler(int irq, void *data) | |||
1262 | mask = pm860x->det.hs_shrt | pm860x->det.hook_det | pm860x->det.lo_shrt | 1262 | mask = pm860x->det.hs_shrt | pm860x->det.hook_det | pm860x->det.lo_shrt |
1263 | | pm860x->det.hp_det; | 1263 | | pm860x->det.hp_det; |
1264 | 1264 | ||
1265 | #ifndef CONFIG_SND_SOC_88PM860X_MODULE | ||
1266 | if (status & (HEADSET_STATUS | MIC_STATUS | SHORT_HS1 | SHORT_HS2 | | ||
1267 | SHORT_LO1 | SHORT_LO2)) | ||
1268 | trace_snd_soc_jack_irq(dev_name(pm860x->codec->dev)); | ||
1269 | #endif | ||
1270 | |||
1265 | if ((pm860x->det.hp_det & SND_JACK_HEADPHONE) | 1271 | if ((pm860x->det.hp_det & SND_JACK_HEADPHONE) |
1266 | && (status & HEADSET_STATUS)) | 1272 | && (status & HEADSET_STATUS)) |
1267 | report |= SND_JACK_HEADPHONE; | 1273 | report |= SND_JACK_HEADPHONE; |