You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
From f07147faddeb0e99bfe181af78fcda9ea7f06c3d Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
Date: Mon, 8 Oct 2018 18:26:15 +0100
|
|
Subject: [PATCH] staging: bcm2835-camera: Correct
|
|
V4L2_CID_COLORFX_CBCR behaviour
|
|
|
|
With V4L2_CID_COLORFX_CBCR calling ctrl_set_colfx it was incorrectly
|
|
assigning the colour values to the enable field of dev->colourfx
|
|
instead of the u and v fields.
|
|
|
|
Correct the assignments.
|
|
|
|
Reported as a Coverity issue
|
|
Detected by CoverityScan CID#1419711 ("Unused value")
|
|
|
|
Reported-by: Colin Ian King <colin.king@canonical.com>
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
---
|
|
drivers/staging/vc04_services/bcm2835-camera/controls.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
|
|
+++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
|
|
@@ -578,8 +578,8 @@ static int ctrl_set_colfx(struct bm2835_
|
|
|
|
control = &dev->component[COMP_CAMERA]->control;
|
|
|
|
- dev->colourfx.enable = (ctrl->val & 0xff00) >> 8;
|
|
- dev->colourfx.enable = ctrl->val & 0xff;
|
|
+ dev->colourfx.u = (ctrl->val & 0xff00) >> 8;
|
|
+ dev->colourfx.v = ctrl->val & 0xff;
|
|
|
|
ret = vchiq_mmal_port_parameter_set(dev->instance, control,
|
|
MMAL_PARAMETER_COLOUR_EFFECT,
|