summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-01-30 14:07:38 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-02-05 18:20:38 -0200
commit971dfc678114d61c07bd6f8ff8380558b6e12d5d (patch)
tree12427dd09d2a522dcffea800f4512c8bbebcf44f
parent1888e4a9742087df22ba64ea2e0e1064edeb8785 (diff)
downloadlinux-971dfc678114d61c07bd6f8ff8380558b6e12d5d.tar.gz
linux-971dfc678114d61c07bd6f8ff8380558b6e12d5d.tar.bz2
linux-971dfc678114d61c07bd6f8ff8380558b6e12d5d.zip
[media] bw-qcam: remove unnecessary qc_reset and qc_setscanmode calls
These are already done elsewhere. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/parport/bw-qcam.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/media/parport/bw-qcam.c b/drivers/media/parport/bw-qcam.c
index d3fe34f14c0d..06231b85e1a9 100644
--- a/drivers/media/parport/bw-qcam.c
+++ b/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;
}