aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@perex.cz>2010-02-16 05:55:18 -0500
committerJaroslav Kysela <perex@perex.cz>2010-02-16 06:00:45 -0500
commit291186e049d7f8178ad31d43c38a53889f25d79e (patch)
treeeb162af2ac0bacdcd7a4aea4bb57132e1bff9165 /sound/usb
parent7affdc17d49b5d9e9c350d5d99ee34ab8655c7b4 (diff)
ALSA: usbmixer - use MAX_ID_ELEMS where possible
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/usbmixer.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c
index 03f125dca5ff..35b4830fb0c4 100644
--- a/sound/usb/usbmixer.c
+++ b/sound/usb/usbmixer.c
@@ -108,7 +108,7 @@ struct mixer_build {
108 struct usb_mixer_interface *mixer; 108 struct usb_mixer_interface *mixer;
109 unsigned char *buffer; 109 unsigned char *buffer;
110 unsigned int buflen; 110 unsigned int buflen;
111 DECLARE_BITMAP(unitbitmap, 256); 111 DECLARE_BITMAP(unitbitmap, MAX_ID_ELEMS);
112 struct usb_audio_term oterm; 112 struct usb_audio_term oterm;
113 const struct usbmix_name_map *map; 113 const struct usbmix_name_map *map;
114 const struct usbmix_selector_map *selector_map; 114 const struct usbmix_selector_map *selector_map;
@@ -2265,7 +2265,8 @@ int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif,
2265 mixer->chip = chip; 2265 mixer->chip = chip;
2266 mixer->ctrlif = ctrlif; 2266 mixer->ctrlif = ctrlif;
2267 mixer->ignore_ctl_error = ignore_error; 2267 mixer->ignore_ctl_error = ignore_error;
2268 mixer->id_elems = kcalloc(256, sizeof(*mixer->id_elems), GFP_KERNEL); 2268 mixer->id_elems = kcalloc(MAX_ID_ELEMS, sizeof(*mixer->id_elems),
2269 GFP_KERNEL);
2269 if (!mixer->id_elems) { 2270 if (!mixer->id_elems) {
2270 kfree(mixer); 2271 kfree(mixer);
2271 return -ENOMEM; 2272 return -ENOMEM;