From f28baddf8de8c10a735c632abfbb75c93c3cefeb Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sat, 13 Jun 2009 18:56:22 -0300
Subject: [PATCH] --- yaml --- r: 153902 b: refs/heads/master c:
 b8bfb5fb348d939a96fc8f71996a2e5e48b4544b h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/media/video/gspca/gspca.c | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 7f36eeef680a..80a7b94f9ebc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14422f9dd8515bfbe6fdbde37eadf59e2980f104
+refs/heads/master: b8bfb5fb348d939a96fc8f71996a2e5e48b4544b
diff --git a/trunk/drivers/media/video/gspca/gspca.c b/trunk/drivers/media/video/gspca/gspca.c
index f7e0355ad644..1e89600986c8 100644
--- a/trunk/drivers/media/video/gspca/gspca.c
+++ b/trunk/drivers/media/video/gspca/gspca.c
@@ -1042,13 +1042,11 @@ static int vidioc_queryctrl(struct file *file, void *priv,
 		for (i = 0; i < gspca_dev->sd_desc->nctrls; i++) {
 			if (gspca_dev->ctrl_dis & (1 << i))
 				continue;
-			if (ctrls->qctrl.id < id)
+			if (gspca_dev->sd_desc->ctrls[i].qctrl.id < id)
 				continue;
-			if (ctrls != NULL) {
-				if (gspca_dev->sd_desc->ctrls[i].qctrl.id
+			if (ctrls && gspca_dev->sd_desc->ctrls[i].qctrl.id
 					    > ctrls->qctrl.id)
-					continue;
-			}
+				continue;
 			ctrls = &gspca_dev->sd_desc->ctrls[i];
 		}
 	} else {