usb: usbtest: Always clear halt else further tests will fail

In test_halt() we set an endpoint halt condition and return on halt verification
failure, then the enpoint will remain halted and all further tests related
to that enpoint will fail. This is because we don't tackle endpoint halt error condition
in any of the tests. To avoid that situation, make sure to clear the
halt condition before exiting test_halt().

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

diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index 6265c549732b46b15295b7a212345c285c4cae69..0317f10823ddd8bf06f1d56c74725f26c6c588cd 100644 (file)
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -1554,8 +1554,17 @@ static int test_halt(struct usbtest_dev *tdev, int ep, struct urb *urb)
                return retval;
        }
        retval = verify_halted(tdev, ep, urb);
-       if (retval < 0)
+       if (retval < 0) {
+               int ret;
+
+               /* clear halt anyways, else further tests will fail */
+               ret = usb_clear_halt(urb->dev, urb->pipe);
+               if (ret)
+                       ERROR(tdev, "ep %02x couldn't clear halt, %d\n",
+                             ep, ret);
+
                return retval;
+       }
 
        /* clear halt (tests API + protocol), verify it worked */
        retval = usb_clear_halt(urb->dev, urb->pipe);