openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'topic/jack' into for-linus

This commit is contained in:
Takashi Iwai 2012-03-18 18:22:50 +01:00
parent cb3f2adc03 53803aead0
commit ca3e9297e2
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/sound/jack.h
View File

@ -53,6 +53,9 @@ enum snd_jack_types {
SND_JACK_BTN_5 = 0x0200,
};
/* Keep in sync with definitions above */
#define SND_JACK_SWITCH_TYPES 6
struct snd_jack {
struct input_dev *input_dev;
int registered;

4
sound/core/jack.c
View File

@ -25,7 +25,7 @@
#include <sound/jack.h>
#include <sound/core.h>
static int jack_switch_types[] = {
static int jack_switch_types[SND_JACK_SWITCH_TYPES] = {
SW_HEADPHONE_INSERT,
SW_MICROPHONE_INSERT,
SW_LINEOUT_INSERT,
@ -128,7 +128,7 @@ int snd_jack_new(struct snd_card *card, const char *id, int type,
jack->type = type;
for (i = 0; i < ARRAY_SIZE(jack_switch_types); i++)
for (i = 0; i < SND_JACK_SWITCH_TYPES; i++)
if (type & (1 << i))
input_set_capability(jack->input_dev, EV_SW,
jack_switch_types[i]);