diff options
| author | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2018-04-18 13:46:37 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-04-19 07:30:42 -0400 |
| commit | a8419a0cd98ddf628a9e38a92110af7cc650dde7 (patch) | |
| tree | d70d3f72422ebf641a09187c3c40369706409b5a | |
| parent | f53c4c20d6d38bcefd89bfcab135486cbb797884 (diff) | |
ASoC: msm8916-wcd-analog: use threaded context for mbhc events
As snd_soc_jack_report() can sleep, move handling of mbhc events to a
thread context rather than in interrupt context.
Fixes: de66b3455023 ('ASoC: codecs: msm8916-wcd-analog: add MBHC support')
Reported-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/codecs/msm8916-wcd-analog.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sound/soc/codecs/msm8916-wcd-analog.c b/sound/soc/codecs/msm8916-wcd-analog.c index 12ee83d52405..b7cf7cce95fe 100644 --- a/sound/soc/codecs/msm8916-wcd-analog.c +++ b/sound/soc/codecs/msm8916-wcd-analog.c | |||
| @@ -1187,7 +1187,8 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev) | |||
| 1187 | return irq; | 1187 | return irq; |
| 1188 | } | 1188 | } |
| 1189 | 1189 | ||
| 1190 | ret = devm_request_irq(dev, irq, pm8916_mbhc_switch_irq_handler, | 1190 | ret = devm_request_threaded_irq(dev, irq, NULL, |
| 1191 | pm8916_mbhc_switch_irq_handler, | ||
| 1191 | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | | 1192 | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | |
| 1192 | IRQF_ONESHOT, | 1193 | IRQF_ONESHOT, |
| 1193 | "mbhc switch irq", priv); | 1194 | "mbhc switch irq", priv); |
| @@ -1201,7 +1202,8 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev) | |||
| 1201 | return irq; | 1202 | return irq; |
| 1202 | } | 1203 | } |
| 1203 | 1204 | ||
| 1204 | ret = devm_request_irq(dev, irq, mbhc_btn_press_irq_handler, | 1205 | ret = devm_request_threaded_irq(dev, irq, NULL, |
| 1206 | mbhc_btn_press_irq_handler, | ||
| 1205 | IRQF_TRIGGER_RISING | | 1207 | IRQF_TRIGGER_RISING | |
| 1206 | IRQF_TRIGGER_FALLING | IRQF_ONESHOT, | 1208 | IRQF_TRIGGER_FALLING | IRQF_ONESHOT, |
| 1207 | "mbhc btn press irq", priv); | 1209 | "mbhc btn press irq", priv); |
| @@ -1214,7 +1216,8 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev) | |||
| 1214 | return irq; | 1216 | return irq; |
| 1215 | } | 1217 | } |
| 1216 | 1218 | ||
| 1217 | ret = devm_request_irq(dev, irq, mbhc_btn_release_irq_handler, | 1219 | ret = devm_request_threaded_irq(dev, irq, NULL, |
| 1220 | mbhc_btn_release_irq_handler, | ||
| 1218 | IRQF_TRIGGER_RISING | | 1221 | IRQF_TRIGGER_RISING | |
| 1219 | IRQF_TRIGGER_FALLING | IRQF_ONESHOT, | 1222 | IRQF_TRIGGER_FALLING | IRQF_ONESHOT, |
| 1220 | "mbhc btn release irq", priv); | 1223 | "mbhc btn release irq", priv); |