From: Dan Carpenter Date: Wed, 29 Jul 2015 21:30:58 +0000 (+0300) Subject: usb: gadget: m66592-udc: forever loop in set_feature() X-Git-Tag: v3.16.35~1314 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bb732b14453b94447bcd990c0b71576b484e0c69;p=thirdparty%2Fkernel%2Fstable.git usb: gadget: m66592-udc: forever loop in set_feature() commit 5feb5d2003499b1094d898c010a7604d7afddc4c upstream. There is an "&&" vs "||" typo here so this loops 3000 times or if we get unlucky it could loop forever. Fixes: ceaa0a6eeadf ('usb: gadget: m66592-udc: add support for TEST_MODE') Signed-off-by: Dan Carpenter Signed-off-by: Felipe Balbi [ luis: backported to 3.16: - file rename: drivers/usb/gadget/udc/m66592-udc.c -> drivers/usb/gadget/m66592-udc.c ] Signed-off-by: Luis Henriques --- diff --git a/drivers/usb/gadget/m66592-udc.c b/drivers/usb/gadget/m66592-udc.c index 0d17174b86f8b..36b47a794d77c 100644 --- a/drivers/usb/gadget/m66592-udc.c +++ b/drivers/usb/gadget/m66592-udc.c @@ -1052,7 +1052,7 @@ static void set_feature(struct m66592 *m66592, struct usb_ctrlrequest *ctrl) tmp = m66592_read(m66592, M66592_INTSTS0) & M66592_CTSQ; udelay(1); - } while (tmp != M66592_CS_IDST || timeout-- > 0); + } while (tmp != M66592_CS_IDST && timeout-- > 0); if (tmp == M66592_CS_IDST) m66592_bset(m66592,