From 998868f9b72ad3aa1b4a82724fc754a63e796967 Mon Sep 17 00:00:00 2001
From: Roel Kluin <roel.kluin@gmail.com>
Date: Mon, 10 Aug 2009 22:17:25 -0300
Subject: [PATCH] --- yaml --- r: 156784 b: refs/heads/master c:
 77f2c2db1146154fb054e9ce955928a66d8c959f h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/media/video/stk-webcam.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index bd7b94a576cc..52e1ca7b8968 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01a5fd6ff3fbae9a599d3334a8cca0f00865e360
+refs/heads/master: 77f2c2db1146154fb054e9ce955928a66d8c959f
diff --git a/trunk/drivers/media/video/stk-webcam.c b/trunk/drivers/media/video/stk-webcam.c
index 4d6785e63455..b154bd961e3b 100644
--- a/trunk/drivers/media/video/stk-webcam.c
+++ b/trunk/drivers/media/video/stk-webcam.c
@@ -1050,8 +1050,8 @@ static int stk_setup_format(struct stk_camera *dev)
 		depth = 1;
 	else
 		depth = 2;
-	while (stk_sizes[i].m != dev->vsettings.mode
-			&& i < ARRAY_SIZE(stk_sizes))
+	while (i < ARRAY_SIZE(stk_sizes) &&
+			stk_sizes[i].m != dev->vsettings.mode)
 		i++;
 	if (i == ARRAY_SIZE(stk_sizes)) {
 		STK_ERROR("Something is broken in %s\n", __func__);