diff options
| author | Takashi Iwai <[email protected]> | 2018-04-16 13:48:05 +0200 |
|---|---|---|
| committer | Takashi Iwai <[email protected]> | 2018-04-16 13:48:17 +0200 |
| commit | 0dc72fcc86e62632d0dbe8df39ed3e91e7f3fb4a (patch) | |
| tree | a4c43c862f311b513de1db0896eb31eea664424d | |
| parent | 60cc43fc888428bb2f18f08997432d426a243338 (diff) | |
| parent | 7ecb46e9ee9af18e304eb9e7d6804c59a408e846 (diff) | |
Merge branch 'for-linus' into for-next
Merge the pending 4.17 fixes into the devel branch for 4.18.
Signed-off-by: Takashi Iwai <[email protected]>
| -rw-r--r-- | sound/usb/line6/midi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/line6/midi.c b/sound/usb/line6/midi.c index 6d7cde56a355..e2cf55c53ea8 100644 --- a/sound/usb/line6/midi.c +++ b/sound/usb/line6/midi.c @@ -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); |