projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
[powerpc.git]
/
sound
/
usb
/
usbmixer.c
diff --git
a/sound/usb/usbmixer.c
b/sound/usb/usbmixer.c
index
e73c1c9
..
c3c08c9
100644
(file)
--- a/
sound/usb/usbmixer.c
+++ b/
sound/usb/usbmixer.c
@@
-363,7
+363,7
@@
static int get_cur_ctl_value(usb_mixer_elem_info_t *cval, int validx, int *value
}
/* channel = 0: master, 1 = first channel */
}
/* channel = 0: master, 1 = first channel */
-
inline static
int get_cur_mix_value(usb_mixer_elem_info_t *cval, int channel, int *value)
+
static inline
int get_cur_mix_value(usb_mixer_elem_info_t *cval, int channel, int *value)
{
return get_ctl_value(cval, GET_CUR, (cval->control << 8) | channel, value);
}
{
return get_ctl_value(cval, GET_CUR, (cval->control << 8) | channel, value);
}
@@
-399,7
+399,7
@@
static int set_cur_ctl_value(usb_mixer_elem_info_t *cval, int validx, int value)
return set_ctl_value(cval, SET_CUR, validx, value);
}
return set_ctl_value(cval, SET_CUR, validx, value);
}
-
inline static
int set_cur_mix_value(usb_mixer_elem_info_t *cval, int channel, int value)
+
static inline
int set_cur_mix_value(usb_mixer_elem_info_t *cval, int channel, int value)
{
return set_ctl_value(cval, SET_CUR, (cval->control << 8) | channel, value);
}
{
return set_ctl_value(cval, SET_CUR, (cval->control << 8) | channel, value);
}
@@
-824,7
+824,7
@@
static void build_feature_ctl(mixer_build_t *state, unsigned char *desc,
if (check_ignored_ctl(state, unitid, control))
return;
if (check_ignored_ctl(state, unitid, control))
return;
- cval = k
calloc(1,
sizeof(*cval), GFP_KERNEL);
+ cval = k
zalloc(
sizeof(*cval), GFP_KERNEL);
if (! cval) {
snd_printk(KERN_ERR "cannot malloc kcontrol\n");
return;
if (! cval) {
snd_printk(KERN_ERR "cannot malloc kcontrol\n");
return;
@@
-997,7
+997,7
@@
static void build_mixer_unit_ctl(mixer_build_t *state, unsigned char *desc,
if (check_ignored_ctl(state, unitid, 0))
return;
if (check_ignored_ctl(state, unitid, 0))
return;
- cval = k
calloc(1,
sizeof(*cval), GFP_KERNEL);
+ cval = k
zalloc(
sizeof(*cval), GFP_KERNEL);
if (! cval)
return;
if (! cval)
return;
@@
-1244,7
+1244,7
@@
static int build_audio_procunit(mixer_build_t *state, int unitid, unsigned char
continue;
if (check_ignored_ctl(state, unitid, valinfo->control))
continue;
continue;
if (check_ignored_ctl(state, unitid, valinfo->control))
continue;
- cval = k
calloc(1,
sizeof(*cval), GFP_KERNEL);
+ cval = k
zalloc(
sizeof(*cval), GFP_KERNEL);
if (! cval) {
snd_printk(KERN_ERR "cannot malloc kcontrol\n");
return -ENOMEM;
if (! cval) {
snd_printk(KERN_ERR "cannot malloc kcontrol\n");
return -ENOMEM;
@@
-1430,7
+1430,7
@@
static int parse_audio_selector_unit(mixer_build_t *state, int unitid, unsigned
if (check_ignored_ctl(state, unitid, 0))
return 0;
if (check_ignored_ctl(state, unitid, 0))
return 0;
- cval = k
calloc(1,
sizeof(*cval), GFP_KERNEL);
+ cval = k
zalloc(
sizeof(*cval), GFP_KERNEL);
if (! cval) {
snd_printk(KERN_ERR "cannot malloc kcontrol\n");
return -ENOMEM;
if (! cval) {
snd_printk(KERN_ERR "cannot malloc kcontrol\n");
return -ENOMEM;
@@
-1945,7
+1945,7
@@
int snd_usb_create_mixer(snd_usb_audio_t *chip, int ctrlif)
strcpy(chip->card->mixername, "USB Mixer");
strcpy(chip->card->mixername, "USB Mixer");
- mixer = k
calloc(1,
sizeof(*mixer), GFP_KERNEL);
+ mixer = k
zalloc(
sizeof(*mixer), GFP_KERNEL);
if (!mixer)
return -ENOMEM;
mixer->chip = chip;
if (!mixer)
return -ENOMEM;
mixer->chip = chip;