diff --git a/[refs] b/[refs]
index 06786fc78825..4805d63fde5d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a11d2b64e1f2556953120d516241243ea365f0ae
+refs/heads/master: d6a2eedfddcded92c8f9b0ac022a99c4134696b0
diff --git a/trunk/lib/string.c b/trunk/lib/string.c
index 0f8624532082..f71bead1be3e 100644
--- a/trunk/lib/string.c
+++ b/trunk/lib/string.c
@@ -689,13 +689,13 @@ EXPORT_SYMBOL(strstr);
  */
 char *strnstr(const char *s1, const char *s2, size_t len)
 {
-	size_t l1 = len, l2;
+	size_t l2;
 
 	l2 = strlen(s2);
 	if (!l2)
 		return (char *)s1;
-	while (l1 >= l2) {
-		l1--;
+	while (len >= l2) {
+		len--;
 		if (!memcmp(s1, s2, l2))
 			return (char *)s1;
 		s1++;