---

yaml --- r: 109542 b: refs/heads/master c: f9b4a37 h: refs/heads/master v: v3
git-mirror · Sep 3, 2008 · 35485d0 · 35485d0
1 parent 73a7922
commit 35485d0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a709749228c5f76f128c69c16f39a52d639bd96
+refs/heads/master: f9b4a377dc6601a3299171c7b24c2c5189c0c10b
diff --git a/trunk/drivers/media/video/gspca/gspca.c b/trunk/drivers/media/video/gspca/gspca.c
@@ -884,11 +884,6 @@ static int vidioc_queryctrl(struct file *file, void *priv,
 			return 0;
 		}
 	}
-	if (id >= V4L2_CID_BASE
-	    && id <= V4L2_CID_LASTP1) {
-		q_ctrl->flags |= V4L2_CTRL_FLAG_DISABLED;
-		return 0;
-	}
 	return -EINVAL;
 }
 

diff --git a/trunk/drivers/media/video/gspca/t613.c b/trunk/drivers/media/video/gspca/t613.c
@@ -30,7 +30,7 @@
 
 #define MAX_GAMMA 0x10		/* 0 to 15 */
 
-#define V4L2_CID_EFFECTS (V4L2_CID_PRIVATE_BASE + 3)
+#define V4L2_CID_EFFECTS (V4L2_CID_PRIVATE_BASE + 0)
 
 MODULE_AUTHOR("Leandro Costantino <le_costantino@pixartargentina.com.ar>");
 MODULE_DESCRIPTION("GSPCA/T613 (JPEG Compliance) USB Camera Driver");