[PATCH 11/31] staging: bcm2835-camera: Fix multiple line dereference errors
Stefan Wahren
wahrenst at gmx.net
Thu Jun 27 18:56:08 UTC 2019
From: Dave Stevenson <dave.stevenson at raspberrypi.org>
Fix checkpatch errors "Avoid multiple line dereference"
Signed-off-by: Dave Stevenson <dave.stevenson at raspberrypi.org>
---
drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
index 23f7754..bde3548 100644
--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
@@ -1028,12 +1028,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];
@@ -1224,9 +1222,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,
--
2.7.4
More information about the devel
mailing list