c1cbff5671689b568e0815065bb775b9db593115
[openwrt/openwrt.git] /
1 From 88e3479406637f8461fd026196f7bc5d4bf81cf9 Mon Sep 17 00:00:00 2001
2 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
3 Date: Wed, 21 Feb 2018 15:48:54 +0000
4 Subject: [PATCH] staging: bcm2835-camera: Fix logical continuation
5 splits
6
7 Fix checkpatch errors for "Logical continuations should be
8 on the previous line".
9
10 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
11 ---
12 drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
16 +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
17 @@ -1114,8 +1114,8 @@ static int mmal_setup_components(struct
18
19 ret = vchiq_mmal_port_set_format(dev->instance, camera_port);
20
21 - if (!ret
22 - && camera_port ==
23 + if (!ret &&
24 + camera_port ==
25 &dev->component[COMP_CAMERA]->output[CAM_PORT_VIDEO]) {
26 bool overlay_enabled =
27 !!dev->component[COMP_PREVIEW]->enabled;