From 63c47752f29571cd3edb27aa2755ac083ef0ebfa Mon Sep 17 00:00:00 2001
From: Roel Kluin <roel.kluin@gmail.com>
Date: Thu, 6 Aug 2009 16:09:51 -0700
Subject: [PATCH] --- yaml --- r: 164991 b: refs/heads/master c:
 417b57b3e4e34df07a2aceaf75baffeacdd9385f h: refs/heads/master i:   164989:
 a83ca991e30f4003a2cc4b0a3bf210f31091cfd8   164987:
 7c56071a0d260bfffd7c9f6454ec8499efa9bc72   164983:
 43e0c716d0dde5be14b0fc2038b974b172be731c   164975:
 9458d49aa8557f4ee16cd8af2d3bf7c90e84ee67   164959:
 f723d695ff5a773220ae2eeff1ba4f5209d66000   164927:
 57aef05802905f401c3a070f5e0a7c0693a080fc   164863:
 2e05ccbbf71351aebbc2ab5976b95343b41d6c15 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/usb/gadget/composite.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6847709f1ae2..d89c637b81f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0defb855c8504c49b92bdc0203689ce9b4cf7ba
+refs/heads/master: 417b57b3e4e34df07a2aceaf75baffeacdd9385f
diff --git a/trunk/drivers/usb/gadget/composite.c b/trunk/drivers/usb/gadget/composite.c
index 59e85234fa0a..d05397ec8a18 100644
--- a/trunk/drivers/usb/gadget/composite.c
+++ b/trunk/drivers/usb/gadget/composite.c
@@ -602,7 +602,7 @@ static int get_string(struct usb_composite_dev *cdev,
 			}
 		}
 
-		for (len = 0; s->wData[len] && len <= 126; len++)
+		for (len = 0; len <= 126 && s->wData[len]; len++)
 			continue;
 		if (!len)
 			return -EINVAL;