Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit e5e4746510d140261918aecce2e5e3aa4456f7e9

Authored by Roger Quadros
Committed by Greg Kroah-Hartman
1 parent 226b3a2e2e
Exists in master and in 16 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

usb: usbtest: Add timetout to simple_io() 

Without a timetout some tests e.g. test_halt() can remain stuck forever.

Signed-off-by: Roger Quadros <rogerq@ti.com>
Reviewed-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 11 additions and 3 deletions Side-by-side Diff

drivers/usb/misc/usbtest.c
Diff comments   View file @ e5e4746
... ... @@ -10,6 +10,7 @@
10 10  
11 11 #include <linux/usb.h>
12 12  
  13 +#define SIMPLE_IO_TIMEOUT 10000 /* in milliseconds */
13 14  
14 15 /*-------------------------------------------------------------------------*/
15 16  
... ... @@ -366,6 +367,7 @@
366 367 int max = urb->transfer_buffer_length;
367 368 struct completion completion;
368 369 int retval = 0;
  370 + unsigned long expire;
369 371  
370 372 urb->context = &completion;
371 373 while (retval == 0 && iterations-- > 0) {
... ... @@ -378,9 +380,15 @@
378 380 if (retval != 0)
379 381 break;
380 382  
381   - /* NOTE: no timeouts; can't be broken out of by interrupt */
382   - wait_for_completion(&completion);
383   - retval = urb->status;
  383 + expire = msecs_to_jiffies(SIMPLE_IO_TIMEOUT);
  384 + if (!wait_for_completion_timeout(&completion, expire)) {
  385 + usb_kill_urb(urb);
  386 + retval = (urb->status == -ENOENT ?
  387 + -ETIMEDOUT : urb->status);
  388 + } else {
  389 + retval = urb->status;
  390 + }
  391 +
384 392 urb->dev = udev;
385 393 if (retval == 0 && usb_pipein(urb->pipe))
386 394 retval = simple_check_buf(tdev, urb);