diff options
| author | Oliver Neukum <oneukum@suse.com> | 2020-09-23 15:43:38 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-09-25 16:33:58 +0200 |
| commit | ec4ed7dc58c6f1845098a46b97d51a5a08d67570 (patch) | |
| tree | 0e8d96032a658cd91f4d75381e8ea3afbe84bc67 /sound/usb/line6/podhd.c | |
| parent | c31db08301277e23ab7366bd4cdfb212ac1a7cca (diff) | |
| download | lwn-ec4ed7dc58c6f1845098a46b97d51a5a08d67570.tar.gz lwn-ec4ed7dc58c6f1845098a46b97d51a5a08d67570.zip | |
Revert "sound: line6: move to use usb_control_msg_send() and usb_control_msg_recv()"
This reverts commit f7ef7614f89e943d7511ee121b0b849f27b60cb2.
The API has to be changed.
Signed-off-by: Oliver Neukum <oneukum@suse.com>
Link: https://lore.kernel.org/r/20200923134348.23862-5-oneukum@suse.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/usb/line6/podhd.c')
| -rw-r--r-- | sound/usb/line6/podhd.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/sound/usb/line6/podhd.c b/sound/usb/line6/podhd.c index a1261f55d62b..eef45f7fef0d 100644 --- a/sound/usb/line6/podhd.c +++ b/sound/usb/line6/podhd.c @@ -183,25 +183,29 @@ static const struct attribute_group podhd_dev_attr_group = { static int podhd_dev_start(struct usb_line6_podhd *pod) { int ret; - u8 init_bytes[8]; + u8 *init_bytes; int i; struct usb_device *usbdev = pod->line6.usbdev; - ret = usb_control_msg_send(usbdev, 0, + init_bytes = kmalloc(8, GFP_KERNEL); + if (!init_bytes) + return -ENOMEM; + + ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT, 0x11, 0, NULL, 0, LINE6_TIMEOUT * HZ); - if (ret) { + if (ret < 0) { dev_err(pod->line6.ifcdev, "read request failed (error %d)\n", ret); goto exit; } /* NOTE: looks like some kind of ping message */ - ret = usb_control_msg_recv(usbdev, 0, 0x67, + ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN, 0x11, 0x0, init_bytes, 3, LINE6_TIMEOUT * HZ); - if (ret) { + if (ret < 0) { dev_err(pod->line6.ifcdev, "receive length failed (error %d)\n", ret); goto exit; @@ -216,12 +220,13 @@ static int podhd_dev_start(struct usb_line6_podhd *pod) goto exit; } - ret = usb_control_msg_send(usbdev, 0, + ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), USB_REQ_SET_FEATURE, USB_TYPE_STANDARD | USB_RECIP_DEVICE | USB_DIR_OUT, 1, 0, NULL, 0, LINE6_TIMEOUT * HZ); exit: + kfree(init_bytes); return ret; } |