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

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
...@@ -125,7 +125,7 @@ static int send_midi_async(struct usb_line6 *line6, unsigned char *data, ...@@ -125,7 +125,7 @@ static int send_midi_async(struct usb_line6 *line6, unsigned char *data,
} }
usb_fill_int_urb(urb, line6->usbdev, usb_fill_int_urb(urb, line6->usbdev,
usb_sndbulkpipe(line6->usbdev, usb_sndintpipe(line6->usbdev,
line6->properties->ep_ctrl_w), line6->properties->ep_ctrl_w),
transfer_buffer, length, midi_sent, line6, transfer_buffer, length, midi_sent, line6,
line6->interval); line6->interval);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment