diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-25 11:40:29 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-25 11:40:29 +0100 |
| commit | a8022697811c3f2271df5ec14fa6f518b731b46a (patch) | |
| tree | d94522dec3c3008d6e204ac5266888d5997b2368 /sound/core | |
| parent | a65056205cdf7efb96fb2558e4f1ec6bae2582ed (diff) | |
| parent | cdc693643271b2e6a693cf8f6afb258cce01f058 (diff) | |
| download | linux-3.10-a8022697811c3f2271df5ec14fa6f518b731b46a.tar.gz linux-3.10-a8022697811c3f2271df5ec14fa6f518b731b46a.tar.bz2 linux-3.10-a8022697811c3f2271df5ec14fa6f518b731b46a.zip | |
Merge branch 'topic/jack-mechanical' into to-push
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/jack.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/core/jack.c b/sound/core/jack.c index 284432f427f..dd4a12dc09a 100644 --- 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) @@ -163,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); } |