projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
[powerpc.git]
/
sound
/
usb
/
usbmixer.c
diff --git
a/sound/usb/usbmixer.c
b/sound/usb/usbmixer.c
index
83ba665
..
fa7056f
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);
}
@@
-623,10
+623,8
@@
static struct usb_feature_control_info audio_feature_info[] = {
/* private_free callback */
static void usb_mixer_elem_free(snd_kcontrol_t *kctl)
{
/* private_free callback */
static void usb_mixer_elem_free(snd_kcontrol_t *kctl)
{
- if (kctl->private_data) {
- kfree(kctl->private_data);
- kctl->private_data = NULL;
- }
+ kfree(kctl->private_data);
+ kctl->private_data = NULL;
}
}