mirror of
https://github.com/torvalds/linux.git
synced 2024-12-15 23:51:46 +00:00
staging: bcm2835-camera: Fix multiple line dereference errors
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:
parent
3485507fc2
commit
eb9e4f3c86
@ -1019,12 +1019,10 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev,
|
||||
if (f->fmt.pix.width <= max_video_width &&
|
||||
f->fmt.pix.height <= max_video_height)
|
||||
camera_port = port =
|
||||
&dev->component[COMP_CAMERA]->
|
||||
output[CAM_PORT_VIDEO];
|
||||
&dev->component[COMP_CAMERA]->output[CAM_PORT_VIDEO];
|
||||
else
|
||||
camera_port = port =
|
||||
&dev->component[COMP_CAMERA]->
|
||||
output[CAM_PORT_CAPTURE];
|
||||
&dev->component[COMP_CAMERA]->output[CAM_PORT_CAPTURE];
|
||||
break;
|
||||
case 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 =
|
||||
(f->fmt.pix.sizeimage <
|
||||
(100 << 10))
|
||||
? (100 << 10)
|
||||
: f->fmt.pix.sizeimage;
|
||||
(100 << 10)) ?
|
||||
(100 << 10) : f->fmt.pix.sizeimage;
|
||||
}
|
||||
v4l2_dbg(1, bcm2835_v4l2_debug,
|
||||
&dev->v4l2_dev,
|
||||
|
Loading…
Reference in New Issue
Block a user