Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-15 23:51:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: bcm2835-camera: Fix multiple line dereference errors

Browse Source 
Fix checkpatch errors "Avoid multiple line dereference"

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>
This commit is contained in:
Dave Stevenson 2019-06-29 14:13:25 +02:00 committed by Greg Kroah-Hartman
parent 3485507fc2
commit eb9e4f3c86
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
View File

@ -1019,12 +1019,10 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev,
if (f->fmt.pix.width <= max_video_width && if (f->fmt.pix.width <= max_video_width &&
f->fmt.pix.height <= max_video_height) f->fmt.pix.height <= max_video_height)
camera_port = port = camera_port = port =
&dev->component[COMP_CAMERA]-> &dev->component[COMP_CAMERA]->output[CAM_PORT_VIDEO];
output[CAM_PORT_VIDEO];
else else
camera_port = port = camera_port = port =
&dev->component[COMP_CAMERA]-> &dev->component[COMP_CAMERA]->output[CAM_PORT_CAPTURE];
output[CAM_PORT_CAPTURE];
break; break;
case COMP_IMAGE_ENCODE: case COMP_IMAGE_ENCODE:
encode_component = dev->component[COMP_IMAGE_ENCODE]; encode_component = dev->component[COMP_IMAGE_ENCODE];
@ -1215,9 +1213,8 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev,
port->current_buffer.size); port->current_buffer.size);
port->current_buffer.size = port->current_buffer.size =
(f->fmt.pix.sizeimage < (f->fmt.pix.sizeimage <
(100 << 10)) (100 << 10)) ?
? (100 << 10) (100 << 10) : f->fmt.pix.sizeimage;
: f->fmt.pix.sizeimage;
} }
v4l2_dbg(1, bcm2835_v4l2_debug, v4l2_dbg(1, bcm2835_v4l2_debug,
&dev->v4l2_dev, &dev->v4l2_dev,