lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'topic/jack-mechanical' into to-push

Browse Source
This commit is contained in:
Takashi Iwai
2008-12-25 11:40:29 +01:00
parent a65056205c cdc6936432
commit a802269781
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sound/core/jack.c
View File

@ -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);
}