| Message ID | 1430389127-24609-5-git-send-email-bardliao@realtek.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e0b5d90669139cd3e7c2592ac2eff47c57318e94 |
| Headers | show |
On Thu, Apr 30, 2015 at 06:18:46PM +0800, Bard Liao wrote: > rt5645->btn_jack is for jack button report. So the mask should be > SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2 | SND_JACK_BTN_3. It doesn't matter in this case but generally bug fixes should go at the start of the series, that way they don't end up depending on other things and it's easier to apply them and get them sent to stable if needed.
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index fa19ad4..f400cf9 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -2933,7 +2933,8 @@ static int rt5645_irq_detection(struct rt5645_priv *rt5645) snd_soc_jack_report(rt5645->mic_jack, report, SND_JACK_MICROPHONE); if (rt5645->en_button_func) snd_soc_jack_report(rt5645->btn_jack, - report, SND_JACK_MICROPHONE); + report, SND_JACK_BTN_0 | SND_JACK_BTN_1 | + SND_JACK_BTN_2 | SND_JACK_BTN_3); return report; }
rt5645->btn_jack is for jack button report. So the mask should be SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2 | SND_JACK_BTN_3. Signed-off-by: Bard Liao <bardliao@realtek.com> --- sound/soc/codecs/rt5645.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)