aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-07 14:48:47 -0500
committerTakashi Iwai <tiwai@suse.de>2012-02-27 11:34:44 -0500
commit53803aead010a314f76a8a6fa132fdcc5edf55ed (patch)
tree50f1cb6702a27d150e034828ccd1e696b2da79ab /sound
parent62aa2b537c6f5957afd98e29f96897419ed5ebab (diff)
ALSA: Use a define for the number of jack switch types
This is intended to facilitate the merge of the two jack detection mechanisms. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/core/jack.c4
1 files changed, 2 insertions, 2 deletions
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 @@
25#include <sound/jack.h> 25#include <sound/jack.h>
26#include <sound/core.h> 26#include <sound/core.h>
27 27
28static int jack_switch_types[] = { 28static 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]);