projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[AFS]: Make the match_*() functions take const options.
[powerpc.git]
/
sound
/
usb
/
usbmixer.c
diff --git
a/sound/usb/usbmixer.c
b/sound/usb/usbmixer.c
index
e516d6a
..
7b3bf35
100644
(file)
--- a/
sound/usb/usbmixer.c
+++ b/
sound/usb/usbmixer.c
@@
-1526,7
+1526,7
@@
static int parse_audio_selector_unit(struct mixer_build *state, int unitid, unsi
namelist[i] = kmalloc(MAX_ITEM_NAME_LEN, GFP_KERNEL);
if (! namelist[i]) {
snd_printk(KERN_ERR "cannot malloc\n");
namelist[i] = kmalloc(MAX_ITEM_NAME_LEN, GFP_KERNEL);
if (! namelist[i]) {
snd_printk(KERN_ERR "cannot malloc\n");
- while (
--i > 0
)
+ while (
i--
)
kfree(namelist[i]);
kfree(namelist);
kfree(cval);
kfree(namelist[i]);
kfree(namelist);
kfree(cval);
@@
-1620,8
+1620,7
@@
static void snd_usb_mixer_free(struct usb_mixer_interface *mixer)
kfree(mixer->urb->transfer_buffer);
usb_free_urb(mixer->urb);
}
kfree(mixer->urb->transfer_buffer);
usb_free_urb(mixer->urb);
}
- if (mixer->rc_urb)
- usb_free_urb(mixer->rc_urb);
+ usb_free_urb(mixer->rc_urb);
kfree(mixer->rc_setup_packet);
kfree(mixer);
}
kfree(mixer->rc_setup_packet);
kfree(mixer);
}
@@
-1710,7
+1709,7
@@
static void snd_usb_mixer_memory_change(struct usb_mixer_interface *mixer,
}
}
}
}
-static void snd_usb_mixer_status_complete(struct urb *urb
, struct pt_regs *regs
)
+static void snd_usb_mixer_status_complete(struct urb *urb)
{
struct usb_mixer_interface *mixer = urb->context;
{
struct usb_mixer_interface *mixer = urb->context;
@@
-1772,8
+1771,7
@@
static int snd_usb_mixer_status_create(struct usb_mixer_interface *mixer)
return 0;
}
return 0;
}
-static void snd_usb_soundblaster_remote_complete(struct urb *urb,
- struct pt_regs *regs)
+static void snd_usb_soundblaster_remote_complete(struct urb *urb)
{
struct usb_mixer_interface *mixer = urb->context;
const struct rc_config *rc = mixer->rc_cfg;
{
struct usb_mixer_interface *mixer = urb->context;
const struct rc_config *rc = mixer->rc_cfg;
@@
-2057,8
+2055,6
@@
void snd_usb_mixer_disconnect(struct list_head *p)
struct usb_mixer_interface *mixer;
mixer = list_entry(p, struct usb_mixer_interface, list);
struct usb_mixer_interface *mixer;
mixer = list_entry(p, struct usb_mixer_interface, list);
- if (mixer->urb)
- usb_kill_urb(mixer->urb);
- if (mixer->rc_urb)
- usb_kill_urb(mixer->rc_urb);
+ usb_kill_urb(mixer->urb);
+ usb_kill_urb(mixer->rc_urb);
}
}