diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2015-07-30 00:30:58 +0300 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2015-10-13 03:46:05 +0100 |
commit | ef1ce106ed3cbe92a741ad170fdc6bea358c854a (patch) | |
tree | 86bc892dc4df3cda51c933f5895b9976b530a81e /drivers | |
parent | fb0a96829d377ecdb158436d21eb8c1cf2679deb (diff) | |
download | kernel_samsung_smdk4412-ef1ce106ed3cbe92a741ad170fdc6bea358c854a.zip kernel_samsung_smdk4412-ef1ce106ed3cbe92a741ad170fdc6bea358c854a.tar.gz kernel_samsung_smdk4412-ef1ce106ed3cbe92a741ad170fdc6bea358c854a.tar.bz2 |
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 <dan.carpenter@oracle.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
[bwh: Backported to 3.2: adjust filename]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/gadget/m66592-udc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/m66592-udc.c b/drivers/usb/gadget/m66592-udc.c index 9aa1cbb..9716d61 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, |