Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

USB: ftdi-elan: Always pass usb_bulk_msg() a timeout in milliseconds.

The kernel doc for usb_bulk_msg() says the timeout for a bulk message should be
specified in milliseconds. The ftdi-elan driver converts milliseconds to
jiffies before passing the timeout to usb_bulk_msg(). This is mostly harmless,
since it will just lead to very long timeouts, but was obviously not the intent
of the original author.

Signed-off-by: Sarah Sharp <sarah.a.sharp@intel.com>
Acked-by: Tony Olech <tony.olech@elandigitalsystems.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Sarah Sharp and committed by
Greg Kroah-Hartman
c0f082c5 ce5dee50

+5 -5
+5 -5
drivers/usb/misc/ftdi-elan.c
··· 698 698 int retval = usb_bulk_msg(ftdi->udev, 699 699 usb_rcvbulkpipe(ftdi->udev, ftdi->bulk_in_endpointAddr), 700 700 ftdi->bulk_in_buffer, ftdi->bulk_in_size, 701 - &packet_bytes, msecs_to_jiffies(50)); 701 + &packet_bytes, 50); 702 702 if (packet_bytes > 2) { 703 703 ftdi->bulk_in_left = packet_bytes - 2; 704 704 ftdi->bulk_in_last = 1; ··· 960 960 int retval = usb_bulk_msg(ftdi->udev, 961 961 usb_rcvbulkpipe(ftdi->udev, ftdi->bulk_in_endpointAddr), 962 962 ftdi->bulk_in_buffer, ftdi->bulk_in_size, 963 - &packet_bytes, msecs_to_jiffies(500)); 963 + &packet_bytes, 500); 964 964 char diag[30 *3 + 4]; 965 965 char *d = diag; 966 966 int m = packet_bytes; ··· 1880 1880 int retval = usb_bulk_msg(ftdi->udev, 1881 1881 usb_rcvbulkpipe(ftdi->udev, ftdi->bulk_in_endpointAddr), 1882 1882 ftdi->bulk_in_buffer, ftdi->bulk_in_size, 1883 - &packet_bytes, msecs_to_jiffies(100)); 1883 + &packet_bytes, 100); 1884 1884 if (packet_bytes > 2) { 1885 1885 char diag[30 *3 + 4]; 1886 1886 char *d = diag; ··· 2067 2067 usb_rcvbulkpipe(ftdi->udev, 2068 2068 ftdi->bulk_in_endpointAddr), 2069 2069 ftdi->bulk_in_buffer, ftdi->bulk_in_size, 2070 - &packet_bytes, msecs_to_jiffies(500)); 2070 + &packet_bytes, 500); 2071 2071 if (packet_bytes > 2) { 2072 2072 char diag[30 *3 + 4]; 2073 2073 char *d = diag; ··· 2176 2176 int retval = usb_bulk_msg(ftdi->udev, 2177 2177 usb_rcvbulkpipe(ftdi->udev, ftdi->bulk_in_endpointAddr), 2178 2178 ftdi->bulk_in_buffer, ftdi->bulk_in_size, 2179 - &packet_bytes, msecs_to_jiffies(1000)); 2179 + &packet_bytes, 1000); 2180 2180 if (packet_bytes > 2) { 2181 2181 char diag[30 *3 + 4]; 2182 2182 char *d = diag;