summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose A. Lopez <lopezp@grupocp.es>2002-09-11 20:13:30 -0700
committerGreg Kroah-Hartman <greg@kroah.com>2002-09-11 20:13:30 -0700
commit6cbd4aa91aee38afd0bd3760bac119fa58bb4128 (patch)
tree33f09354a786330757aa41efc369a89a6c3f5dcd
parent90cc0e1ad3a707002095702bf86eb5bdd2a000dc (diff)
[PATCH] usbmidi patch
I have changed the name of a local variable "l" to be "j", because with some fonts should be difficult to see if [1+l+i] means [2+i] or what.
-rw-r--r--drivers/usb/class/usb-midi.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/class/usb-midi.c b/drivers/usb/class/usb-midi.c
index cd35694b7d35..1a04189b3a49 100644
--- a/drivers/usb/class/usb-midi.c
+++ b/drivers/usb/class/usb-midi.c
@@ -368,7 +368,7 @@ static void usb_bulk_read(struct urb *urb)
{
struct midi_in_endpoint *ep = (struct midi_in_endpoint *)(urb->context);
unsigned char *data = urb->transfer_buffer;
- int i, l, wake;
+ int i, j, wake;
unsigned long int flags;
if ( !ep->urbSubmitted ) {
@@ -379,14 +379,14 @@ static void usb_bulk_read(struct urb *urb)
wake = 0;
spin_lock_irqsave( &ep->lock, flags );
- for(l = 0; l < urb->actual_length; l += 4) {
- int cin = (data[l]>>0)&0xf;
- int cab = (data[l]>>4)&0xf;
+ for(j = 0; j < urb->actual_length; j += 4) {
+ int cin = (data[j]>>0)&0xf;
+ int cab = (data[j]>>4)&0xf;
struct usb_mididev *cable = ep->cables[cab];
if ( cable ) {
int len = cin_to_len[cin]; /** length of MIDI data **/
for (i = 0; i < len; i++) {
- cable->min.buf[cable->min.bufWrPtr] = data[1+i];
+ cable->min.buf[cable->min.bufWrPtr] = data[1+i+j];
cable->min.bufWrPtr = (cable->min.bufWrPtr+1)%MIDI_IN_BUFSIZ;
if (cable->min.bufRemains < MIDI_IN_BUFSIZ)
cable->min.bufRemains += 1;