staging: bcm2835-camera: Correct V4L2_CID_COLORFX_CBCR behaviour
authorDave Stevenson <dave.stevenson@raspberrypi.org>
Sat, 29 Jun 2019 12:48:30 +0000 (14:48 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Jul 2019 07:09:39 +0000 (09:09 +0200)
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>
Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vc04_services/bcm2835-camera/controls.c

index 038b9b9..b8aaedd 100644 (file)
@@ -574,8 +574,8 @@ static int ctrl_set_colfx(struct bm2835_mmal_dev *dev,
 
        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,