Merge branch 'drivers-platform' into release

[linux-2.6-omap-h63xx.git] / sound / core / jack.c

diff --git a/sound/core/jack.c b/sound/core/jack.c
index 438445f77d6d8dd68eb3d4fd9ca846f2b3a6dc30..dd4a12dc09aa44f4c50c5b60f2cf5584c5635589 100644 (file)
--- a/sound/core/jack.c
+++ b/sound/core/jack.c
@@ -109,6 +109,9 @@ int snd_jack_new(struct snd_card *card, const char *id, int type,
        if (type & SND_JACK_MICROPHONE)
                input_set_capability(jack->input_dev, EV_SW,
                                     SW_MICROPHONE_INSERT);
+       if (type & SND_JACK_MECHANICAL)
+               input_set_capability(jack->input_dev, EV_SW,
+                                    SW_JACK_PHYSICAL_INSERT);
 
        err = snd_device_new(card, SNDRV_DEV_JACK, jack, &ops);
        if (err < 0)
@@ -151,6 +154,9 @@ EXPORT_SYMBOL(snd_jack_set_parent);
  */
 void snd_jack_report(struct snd_jack *jack, int status)
 {
+       if (!jack)
+               return;
+
        if (jack->type & SND_JACK_HEADPHONE)
                input_report_switch(jack->input_dev, SW_HEADPHONE_INSERT,
                                    status & SND_JACK_HEADPHONE);
@@ -160,6 +166,9 @@ void snd_jack_report(struct snd_jack *jack, int status)
        if (jack->type & SND_JACK_MICROPHONE)
                input_report_switch(jack->input_dev, SW_MICROPHONE_INSERT,
                                    status & SND_JACK_MICROPHONE);
+       if (jack->type & SND_JACK_MECHANICAL)
+               input_report_switch(jack->input_dev, SW_JACK_PHYSICAL_INSERT,
+                                   status & SND_JACK_MECHANICAL);
 
        input_sync(jack->input_dev);
 }