---

yaml --- r: 357453 b: refs/heads/master c: 971dfc6 h: refs/heads/master i: 357451: e74b236 v: v3
git-mirror · Feb 5, 2013 · ad625cc · ad625cc
1 parent 7985494
commit ad625cc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1888e4a9742087df22ba64ea2e0e1064edeb8785
+refs/heads/master: 971dfc678114d61c07bd6f8ff8380558b6e12d5d
diff --git a/trunk/drivers/media/parport/bw-qcam.c b/trunk/drivers/media/parport/bw-qcam.c
@@ -421,8 +421,6 @@ static void qc_set(struct qcam *q)
 	int val;
 	int val2;
 
-	qc_reset(q);
-
 	/* Set the brightness.  Yes, this is repetitive, but it works.
 	 * Shorter versions seem to fail subtly.  Feel free to try :-). */
 	/* I think the problem was in qc_command, not here -- bls */
@@ -879,10 +877,8 @@ static int qcam_s_ctrl(struct v4l2_ctrl *ctrl)
 		ret = -EINVAL;
 		break;
 	}
-	if (ret == 0) {
-		qc_setscanmode(qcam);
+	if (ret == 0)
 		qcam->status |= QC_PARAM_CHANGE;
-	}
 	return ret;
 }