diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /sound/usb/usbmidi.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'sound/usb/usbmidi.c')
| -rw-r--r-- | sound/usb/usbmidi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c index 0dcf78adb99a..b7c5e59b2299 100644 --- a/sound/usb/usbmidi.c +++ b/sound/usb/usbmidi.c | |||
| @@ -223,7 +223,7 @@ static void dump_urb(const char *type, const u8 *data, int length) | |||
| 223 | /* | 223 | /* |
| 224 | * Processes the data read from the device. | 224 | * Processes the data read from the device. |
| 225 | */ | 225 | */ |
| 226 | static void snd_usbmidi_in_urb_complete(struct urb* urb, struct pt_regs *regs) | 226 | static void snd_usbmidi_in_urb_complete(struct urb* urb) |
| 227 | { | 227 | { |
| 228 | struct snd_usb_midi_in_endpoint* ep = urb->context; | 228 | struct snd_usb_midi_in_endpoint* ep = urb->context; |
| 229 | 229 | ||
| @@ -247,7 +247,7 @@ static void snd_usbmidi_in_urb_complete(struct urb* urb, struct pt_regs *regs) | |||
| 247 | snd_usbmidi_submit_urb(urb, GFP_ATOMIC); | 247 | snd_usbmidi_submit_urb(urb, GFP_ATOMIC); |
| 248 | } | 248 | } |
| 249 | 249 | ||
| 250 | static void snd_usbmidi_out_urb_complete(struct urb* urb, struct pt_regs *regs) | 250 | static void snd_usbmidi_out_urb_complete(struct urb* urb) |
| 251 | { | 251 | { |
| 252 | struct snd_usb_midi_out_endpoint* ep = urb->context; | 252 | struct snd_usb_midi_out_endpoint* ep = urb->context; |
| 253 | 253 | ||