3 files changed, 8 insertions, 0 deletions

diff --git a/include/linux/input.h b/include/linux/input.h
index a5802c9c81a4..7323d2ff5151 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -644,6 +644,7 @@ struct input_absinfo {
 #define SW_RADIO                SW_RFKILL_ALL   /* deprecated */
 #define SW_MICROPHONE_INSERT    0x04  /* set = inserted */
 #define SW_DOCK                 0x05  /* set = plugged into dock */
+#define SW_LINEOUT_INSERT       0x06  /* set = inserted */
 #define SW_MAX                  0x0f
 #define SW_CNT                  (SW_MAX+1)
 
diff --git a/include/sound/jack.h b/include/sound/jack.h
index b1b2b8b59adb..7cb25f4b50bb 100644
--- a/include/sound/jack.h
+++ b/include/sound/jack.h
@@ -35,6 +35,7 @@ enum snd_jack_types {
         SND_JACK_HEADPHONE      = 0x0001,
         SND_JACK_MICROPHONE     = 0x0002,
         SND_JACK_HEADSET        = SND_JACK_HEADPHONE | SND_JACK_MICROPHONE,
+        SND_JACK_LINEOUT        = 0x0004,
 };
 
 struct snd_jack {
diff --git a/sound/core/jack.c b/sound/core/jack.c
index 8133a2b173a5..c4bb9bad3133 100644
--- a/sound/core/jack.c
+++ b/sound/core/jack.c
@@ -102,6 +102,9 @@ int snd_jack_new(struct snd_card *card, const char *id, int type,
         if (type & SND_JACK_HEADPHONE)
                 input_set_capability(jack->input_dev, EV_SW,
                                      SW_HEADPHONE_INSERT);
+        if (type & SND_JACK_LINEOUT)
+                input_set_capability(jack->input_dev, EV_SW,
+                                     SW_LINEOUT_INSERT);
         if (type & SND_JACK_MICROPHONE)
                 input_set_capability(jack->input_dev, EV_SW,
                                      SW_MICROPHONE_INSERT);
@@ -150,6 +153,9 @@ void snd_jack_report(struct snd_jack *jack, int status)
         if (jack->type & SND_JACK_HEADPHONE)
                 input_report_switch(jack->input_dev, SW_HEADPHONE_INSERT,
                                     status & SND_JACK_HEADPHONE);
+        if (jack->type & SND_JACK_LINEOUT)
+                input_report_switch(jack->input_dev, SW_LINEOUT_INSERT,
+                                    status & SND_JACK_LINEOUT);
         if (jack->type & SND_JACK_MICROPHONE)
                 input_report_switch(jack->input_dev, SW_MICROPHONE_INSERT,
                                     status & SND_JACK_MICROPHONE);