diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-17 15:36:38 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-17 18:10:44 +0000 |
| commit | 1c6e555c3a66af29a51690748ca54314e62c16d5 (patch) | |
| tree | d07668266bb04630c9ba9f2d86c5bc89c6ccf5d4 /sound | |
| parent | 57d54889cd00db2752994b389ba714138652e60c (diff) | |
| download | linux-1c6e555c3a66af29a51690748ca54314e62c16d5.tar.bz2 | |
ALSA: Rename jack switch table in preparation for button support
Avoids confusion when we have button support.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/core/jack.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sound/core/jack.c b/sound/core/jack.c index f705eec7372a..f6f091f2b382 100644 --- a/sound/core/jack.c +++ b/sound/core/jack.c @@ -23,7 +23,7 @@ #include <sound/jack.h> #include <sound/core.h> -static int jack_types[] = { +static int jack_switch_types[] = { SW_HEADPHONE_INSERT, SW_MICROPHONE_INSERT, SW_LINEOUT_INSERT, @@ -112,10 +112,10 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, jack->type = type; - for (i = 0; i < ARRAY_SIZE(jack_types); i++) + for (i = 0; i < ARRAY_SIZE(jack_switch_types); i++) if (type & (1 << i)) input_set_capability(jack->input_dev, EV_SW, - jack_types[i]); + jack_switch_types[i]); err = snd_device_new(card, SNDRV_DEV_JACK, jack, &ops); if (err < 0) @@ -163,10 +163,11 @@ void snd_jack_report(struct snd_jack *jack, int status) if (!jack) return; - for (i = 0; i < ARRAY_SIZE(jack_types); i++) { + for (i = 0; i < ARRAY_SIZE(jack_switch_types); i++) { int testbit = 1 << i; if (jack->type & testbit) - input_report_switch(jack->input_dev, jack_types[i], + input_report_switch(jack->input_dev, + jack_switch_types[i], status & testbit); } |