diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-29 08:05:21 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-29 08:06:18 -0500 |
| commit | 7116f452c8e3e38f99ab3231a758eb366dacfe4a (patch) | |
| tree | 0f49e256fc6aa4052292442b310cce427ef5a317 /sound/soc/codecs/88pm860x-codec.c | |
| parent | 22a756ee8951e597c76e5a60f81d40a43054489e (diff) | |
ASoC: Yet more x86 tracepoint workarounds
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/88pm860x-codec.c')
| -rw-r--r-- | sound/soc/codecs/88pm860x-codec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c index 5da8207a6961..06b6981b8d6d 100644 --- a/sound/soc/codecs/88pm860x-codec.c +++ b/sound/soc/codecs/88pm860x-codec.c | |||
| @@ -1262,7 +1262,7 @@ 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 | 1265 | #ifndef CONFIG_SND_SOC_88PM860X_MODULE |
| 1266 | if (status & (HEADSET_STATUS | MIC_STATUS | SHORT_HS1 | SHORT_HS2 | | 1266 | if (status & (HEADSET_STATUS | MIC_STATUS | SHORT_HS1 | SHORT_HS2 | |
| 1267 | SHORT_LO1 | SHORT_LO2)) | 1267 | SHORT_LO1 | SHORT_LO2)) |
| 1268 | trace_snd_soc_jack_irq(dev_name(pm860x->codec->dev)); | 1268 | trace_snd_soc_jack_irq(dev_name(pm860x->codec->dev)); |