diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-03-18 18:22:50 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-03-18 18:22:50 +0100 |
| commit | ca3e9297e29c48eebb010d0225ea580fbcc64c88 (patch) | |
| tree | f0ad13e600e9c5a7c4357826b2b954642629d306 | |
| parent | cb3f2adc03ab055b19c677a6283523861fafebdd (diff) | |
| parent | 53803aead010a314f76a8a6fa132fdcc5edf55ed (diff) | |
Merge branch 'topic/jack' into for-linus
| -rw-r--r-- | include/sound/jack.h | 3 | ||||
| -rw-r--r-- | sound/core/jack.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/sound/jack.h b/include/sound/jack.h index 63c790742db..58916573db5 100644 --- a/include/sound/jack.h +++ b/include/sound/jack.h @@ -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; diff --git a/sound/core/jack.c b/sound/core/jack.c index 26edf63b265..471e1e3b0a9 100644 --- a/sound/core/jack.c +++ b/sound/core/jack.c @@ -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]); |