Commit ca3e9297 authored by Takashi Iwai's avatar Takashi Iwai

Merge branch 'topic/jack' into for-linus

parents cb3f2adc 53803aea
...@@ -53,6 +53,9 @@ enum snd_jack_types { ...@@ -53,6 +53,9 @@ enum snd_jack_types {
SND_JACK_BTN_5 = 0x0200, SND_JACK_BTN_5 = 0x0200,
}; };
/* Keep in sync with definitions above */
#define SND_JACK_SWITCH_TYPES 6
struct snd_jack { struct snd_jack {
struct input_dev *input_dev; struct input_dev *input_dev;
int registered; int registered;
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <sound/jack.h> #include <sound/jack.h>
#include <sound/core.h> #include <sound/core.h>
static int jack_switch_types[] = { static int jack_switch_types[SND_JACK_SWITCH_TYPES] = {
SW_HEADPHONE_INSERT, SW_HEADPHONE_INSERT,
SW_MICROPHONE_INSERT, SW_MICROPHONE_INSERT,
SW_LINEOUT_INSERT, SW_LINEOUT_INSERT,
...@@ -128,7 +128,7 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, ...@@ -128,7 +128,7 @@ int snd_jack_new(struct snd_card *card, const char *id, int type,
jack->type = 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)) if (type & (1 << i))
input_set_capability(jack->input_dev, EV_SW, input_set_capability(jack->input_dev, EV_SW,
jack_switch_types[i]); jack_switch_types[i]);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment