diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-03-18 13:22:50 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-03-18 13:22:50 -0400 |
commit | ca3e9297e29c48eebb010d0225ea580fbcc64c88 (patch) | |
tree | f0ad13e600e9c5a7c4357826b2b954642629d306 /sound | |
parent | cb3f2adc03ab055b19c677a6283523861fafebdd (diff) | |
parent | 53803aead010a314f76a8a6fa132fdcc5edf55ed (diff) |
Merge branch 'topic/jack' into for-linus
Diffstat (limited to 'sound')
-rw-r--r-- | sound/core/jack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/jack.c b/sound/core/jack.c index 26edf63b265f..471e1e3b0a99 100644 --- a/sound/core/jack.c +++ b/sound/core/jack.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <sound/jack.h> | 25 | #include <sound/jack.h> |
26 | #include <sound/core.h> | 26 | #include <sound/core.h> |
27 | 27 | ||
28 | static int jack_switch_types[] = { | 28 | static int jack_switch_types[SND_JACK_SWITCH_TYPES] = { |
29 | SW_HEADPHONE_INSERT, | 29 | SW_HEADPHONE_INSERT, |
30 | SW_MICROPHONE_INSERT, | 30 | SW_MICROPHONE_INSERT, |
31 | SW_LINEOUT_INSERT, | 31 | SW_LINEOUT_INSERT, |
@@ -128,7 +128,7 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, | |||
128 | 128 | ||
129 | jack->type = type; | 129 | jack->type = type; |
130 | 130 | ||
131 | for (i = 0; i < ARRAY_SIZE(jack_switch_types); i++) | 131 | for (i = 0; i < SND_JACK_SWITCH_TYPES; i++) |
132 | if (type & (1 << i)) | 132 | if (type & (1 << i)) |
133 | input_set_capability(jack->input_dev, EV_SW, | 133 | input_set_capability(jack->input_dev, EV_SW, |
134 | jack_switch_types[i]); | 134 | jack_switch_types[i]); |