Commit 0dc72fcc authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 



Merge the pending 4.17 fixes into the devel branch for 4.18.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 60cc43fc 7ecb46e9

sound/usb/line6/midi.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static int send_midi_async(struct usb_line6 *line6, unsigned char *data, 
	}



	usb_fill_int_urb(urb, line6->usbdev,

			 usb_sndbulkpipe(line6->usbdev,

			 usb_sndintpipe(line6->usbdev,

					 line6->properties->ep_ctrl_w),

			 transfer_buffer, length, midi_sent, line6,

			 line6->interval);