| From bb06fadc8223df7d18f9c3b355a824b05873b230 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 12 Sep 2018 10:51:05 +0200 |
| Subject: usb: usbtmc: Fix ioctl USBTMC_IOCTL_ABORT_BULK_OUT |
| |
| From: Guido Kiener <guido@kiener-muenchen.de> |
| |
| [ Upstream commit 0e59088e7ff7aeda49dedadbf0e967761b909ad8 ] |
| |
| Add parameter 'tag' to function usbtmc_ioctl_abort_bulk_out_tag() |
| for future versions. |
| |
| Use USBTMC_BUFSIZE (4k) instead of USBTMC_SIZE_IOBUFFER (2k). |
| Using USBTMC_SIZE_IOBUFFER is deprecated. |
| |
| Insert a sleep of 50 ms between subsequent |
| CHECK_ABORT_BULK_OUT_STATUS control requests to avoid stressing |
| the instrument with repeated requests. |
| |
| Use common macro USB_CTRL_GET_TIMEOUT instead of USBTMC_TIMEOUT. |
| |
| Signed-off-by: Guido Kiener <guido.kiener@rohde-schwarz.com> |
| Reviewed-by: Steve Bayless <steve_bayless@keysight.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/usb/class/usbtmc.c | 16 ++++++++++++---- |
| 1 file changed, 12 insertions(+), 4 deletions(-) |
| |
| diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c |
| index 83ffa5a14c3db..3ce45c9e9d20d 100644 |
| --- a/drivers/usb/class/usbtmc.c |
| +++ b/drivers/usb/class/usbtmc.c |
| @@ -342,7 +342,8 @@ exit: |
| |
| } |
| |
| -static int usbtmc_ioctl_abort_bulk_out(struct usbtmc_device_data *data) |
| +static int usbtmc_ioctl_abort_bulk_out_tag(struct usbtmc_device_data *data, |
| + u8 tag) |
| { |
| struct device *dev; |
| u8 *buffer; |
| @@ -359,8 +360,8 @@ static int usbtmc_ioctl_abort_bulk_out(struct usbtmc_device_data *data) |
| usb_rcvctrlpipe(data->usb_dev, 0), |
| USBTMC_REQUEST_INITIATE_ABORT_BULK_OUT, |
| USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_ENDPOINT, |
| - data->bTag_last_write, data->bulk_out, |
| - buffer, 2, USBTMC_TIMEOUT); |
| + tag, data->bulk_out, |
| + buffer, 2, USB_CTRL_GET_TIMEOUT); |
| |
| if (rv < 0) { |
| dev_err(dev, "usb_control_msg returned %d\n", rv); |
| @@ -379,12 +380,14 @@ static int usbtmc_ioctl_abort_bulk_out(struct usbtmc_device_data *data) |
| n = 0; |
| |
| usbtmc_abort_bulk_out_check_status: |
| + /* do not stress device with subsequent requests */ |
| + msleep(50); |
| rv = usb_control_msg(data->usb_dev, |
| usb_rcvctrlpipe(data->usb_dev, 0), |
| USBTMC_REQUEST_CHECK_ABORT_BULK_OUT_STATUS, |
| USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_ENDPOINT, |
| 0, data->bulk_out, buffer, 0x08, |
| - USBTMC_TIMEOUT); |
| + USB_CTRL_GET_TIMEOUT); |
| n++; |
| if (rv < 0) { |
| dev_err(dev, "usb_control_msg returned %d\n", rv); |
| @@ -418,6 +421,11 @@ exit: |
| return rv; |
| } |
| |
| +static int usbtmc_ioctl_abort_bulk_out(struct usbtmc_device_data *data) |
| +{ |
| + return usbtmc_ioctl_abort_bulk_out_tag(data, data->bTag_last_write); |
| +} |
| + |
| static int usbtmc488_ioctl_read_stb(struct usbtmc_file_data *file_data, |
| void __user *arg) |
| { |
| -- |
| 2.20.1 |
| |