diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2020-03-09 19:49:58 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-03-09 19:50:18 +0100 |
| commit | cf4afed90c1f926d12277213b54d830c839a1bda (patch) | |
| tree | b1c7319e85443d097634ef6a3d4623afc64188cb /sound/usb | |
| parent | ALSA: firewire: use KBUILD_MODNAME for struct driver.name instead of string (diff) | |
| parent | ALSA: line6: Fix endless MIDI read loop (diff) | |
| download | wireguard-linux-cf4afed90c1f926d12277213b54d830c839a1bda.tar.xz wireguard-linux-cf4afed90c1f926d12277213b54d830c839a1bda.zip | |
Merge branch 'for-linus' into for-next
Back-merge of 5.6 devel branch for further changes in 5.7 cycle
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/line6/driver.c | 2 | ||||
| -rw-r--r-- | sound/usb/line6/midibuf.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c index b5a3f754a4f1..4f096685ed65 100644 --- a/sound/usb/line6/driver.c +++ b/sound/usb/line6/driver.c @@ -305,7 +305,7 @@ static void line6_data_received(struct urb *urb) line6_midibuf_read(mb, line6->buffer_message, LINE6_MIDI_MESSAGE_MAXLEN); - if (done == 0) + if (done <= 0) break; line6->message_length = done; diff --git a/sound/usb/line6/midibuf.c b/sound/usb/line6/midibuf.c index 8d6eefa0d936..6a70463f82c4 100644 --- a/sound/usb/line6/midibuf.c +++ b/sound/usb/line6/midibuf.c @@ -159,7 +159,7 @@ int line6_midibuf_read(struct midi_buffer *this, unsigned char *data, int midi_length_prev = midibuf_message_length(this->command_prev); - if (midi_length_prev > 0) { + if (midi_length_prev > 1) { midi_length = midi_length_prev - 1; repeat = 1; } else |