From eac5d88e9125cff96d40afa0674dc0a39fc11711 Mon Sep 17 00:00:00 2001 From: Sudheer Papothi Date: Thu, 26 Jan 2017 03:37:12 +0530 Subject: [PATCH] ANDROID: GKI: ASoC: jack: Fix buttons enum value Microphone2 and SND_JACK_BTN_5 enum are same, resulting in SND_JACK_BTN_5 event getting triggered when ANC headset is plugged into the device. Use unique values in sound jack type enum. Test: build Bug: 151372815 Change-Id: I668e50afcad11b1f62f511f4241f79bad858c7d2 Signed-off-by: Sudheer Papothi (cherry picked from commit ce59edee66bf7ce6ea7d0baee51c2cbd18685521) Signed-off-by: Hridya Valsaraju --- include/sound/jack.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/sound/jack.h b/include/sound/jack.h index c66e4e9567b6..722a20e05f08 100644 --- a/include/sound/jack.h +++ b/include/sound/jack.h @@ -66,12 +66,12 @@ enum snd_jack_types { SND_JACK_MICROPHONE2, /* Kept separate from switches to facilitate implementation */ - SND_JACK_BTN_0 = 0x4000, - SND_JACK_BTN_1 = 0x2000, - SND_JACK_BTN_2 = 0x1000, - SND_JACK_BTN_3 = 0x0800, - SND_JACK_BTN_4 = 0x0400, - SND_JACK_BTN_5 = 0x0200, + SND_JACK_BTN_0 = 0x8000, + SND_JACK_BTN_1 = 0x4000, + SND_JACK_BTN_2 = 0x2000, + SND_JACK_BTN_3 = 0x1000, + SND_JACK_BTN_4 = 0x0800, + SND_JACK_BTN_5 = 0x0400, }; struct snd_jack {