Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 768668e1 authored by Dave Penkler's avatar Dave Penkler Committed by Greg Kroah-Hartman
Browse files

usb: usbtmc: Fix timeout value in get_stb 



commit 342e4955a1f1ce28c70a589999b76365082dbf10 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: 048c6d88 ("usb: usbtmc: Add ioctls to set/get usb timeout")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDave Penkler <dpenkler@gmail.com>
Link: https://lore.kernel.org/r/20250521121656.18174-4-dpenkler@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 90da5d98

drivers/usb/class/usbtmc.c

+3 −1
Original line number Diff line number Diff line
@@ -486,6 +486,7 @@ static int usbtmc488_ioctl_read_stb(struct usbtmc_file_data *file_data, 
	__u8 stb;

	int rv;

	long wait_rv;

	unsigned long expire;



	dev_dbg(dev, "Enter ioctl_read_stb iin_ep_present: %d\n",

		data->iin_ep_present);
@@ -528,10 +529,11 @@ static int usbtmc488_ioctl_read_stb(struct usbtmc_file_data *file_data, 
	}



	if (data->iin_ep_present) {

		expire = msecs_to_jiffies(file_data->timeout);

		wait_rv = wait_event_interruptible_timeout(

			data->waitq,

			atomic_read(&data->iin_data_valid) != 0,

			file_data->timeout);

			expire);

		if (wait_rv < 0) {

			dev_dbg(dev, "wait interrupted %ld\n", wait_rv);

			rv = wait_rv;