Skip to content

Commit b4fac3f

Browse files
dpenklergregkh
authored andcommitted
usb: usbtmc: Fix timeout value in get_stb
commit 342e495 upstream. wait_event_interruptible_timeout requires a timeout argument in units of jiffies. It was being called in usbtmc_get_stb with the usb timeout value which is in units of milliseconds. Pass the timeout argument converted to jiffies. Fixes: 048c6d8 ("usb: usbtmc: Add ioctls to set/get usb timeout") Cc: stable@vger.kernel.org Signed-off-by: Dave Penkler <dpenkler@gmail.com> Link: https://lore.kernel.org/r/20250521121656.18174-4-dpenkler@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 985961d commit b4fac3f

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/usb/class/usbtmc.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,7 @@ static int usbtmc_get_stb(struct usbtmc_file_data *file_data, __u8 *stb)
483483
u8 tag;
484484
int rv;
485485
long wait_rv;
486+
unsigned long expire;
486487

487488
dev_dbg(dev, "Enter ioctl_read_stb iin_ep_present: %d\n",
488489
data->iin_ep_present);
@@ -512,10 +513,11 @@ static int usbtmc_get_stb(struct usbtmc_file_data *file_data, __u8 *stb)
512513
}
513514

514515
if (data->iin_ep_present) {
516+
expire = msecs_to_jiffies(file_data->timeout);
515517
wait_rv = wait_event_interruptible_timeout(
516518
data->waitq,
517519
atomic_read(&data->iin_data_valid) != 0,
518-
file_data->timeout);
520+
expire);
519521
if (wait_rv < 0) {
520522
dev_dbg(dev, "wait interrupted %ld\n", wait_rv);
521523
rv = wait_rv;

0 commit comments

Comments
 (0)