diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-01-30 12:07:38 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-02-05 15:20:38 -0500 |
commit | 971dfc678114d61c07bd6f8ff8380558b6e12d5d (patch) | |
tree | 12427dd09d2a522dcffea800f4512c8bbebcf44f /drivers/media/parport | |
parent | 1888e4a9742087df22ba64ea2e0e1064edeb8785 (diff) |
[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>
Diffstat (limited to 'drivers/media/parport')
-rw-r--r-- | drivers/media/parport/bw-qcam.c | 6 |
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) | |||
421 | int val; | 421 | int val; |
422 | int val2; | 422 | int val2; |
423 | 423 | ||
424 | qc_reset(q); | ||
425 | |||
426 | /* Set the brightness. Yes, this is repetitive, but it works. | 424 | /* Set the brightness. Yes, this is repetitive, but it works. |
427 | * Shorter versions seem to fail subtly. Feel free to try :-). */ | 425 | * Shorter versions seem to fail subtly. Feel free to try :-). */ |
428 | /* I think the problem was in qc_command, not here -- bls */ | 426 | /* I think the problem was in qc_command, not here -- bls */ |
@@ -879,10 +877,8 @@ static int qcam_s_ctrl(struct v4l2_ctrl *ctrl) | |||
879 | ret = -EINVAL; | 877 | ret = -EINVAL; |
880 | break; | 878 | break; |
881 | } | 879 | } |
882 | if (ret == 0) { | 880 | if (ret == 0) |
883 | qc_setscanmode(qcam); | ||
884 | qcam->status |= QC_PARAM_CHANGE; | 881 | qcam->status |= QC_PARAM_CHANGE; |
885 | } | ||
886 | return ret; | 882 | return ret; |
887 | } | 883 | } |
888 | 884 | ||