aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/vc04_services
diff options
context:
space:
mode:
authorJules Irenge <jbi.octave@gmail.com>2019-10-12 16:18:05 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-10-13 10:00:34 +0200
commitf152f52c308dbaf41f3874805f9a2811f96730da (patch)
treea5c984efa15c2589fd1da1d3d0611df6f098587b /drivers/staging/vc04_services
parentstaging: isdn: remove assignment in if conditionals (diff)
downloadlinux-dev-f152f52c308dbaf41f3874805f9a2811f96730da.tar.xz
linux-dev-f152f52c308dbaf41f3874805f9a2811f96730da.zip
staging: vc04_services: place the AND operator at the end of the previous line
Place the AND logical operator at the end of the previous line; to fix warning of "Logical continuations should be on the previous line". Issue detected by checkpatch tool. Signed-off-by: Jules Irenge <jbi.octave@gmail.com> Link: https://lore.kernel.org/r/20191012151805.17988-1-jbi.octave@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vc04_services')
-rw-r--r--drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
index d4d1e44b16b2..beb6a0063bb8 100644
--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
@@ -1090,8 +1090,8 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev,
ret = vchiq_mmal_port_set_format(dev->instance, camera_port);
- if (!ret
- && camera_port ==
+ if (!ret &&
+ camera_port ==
&dev->component[COMP_CAMERA]->output[CAM_PORT_VIDEO]) {
bool overlay_enabled =
!!dev->component[COMP_PREVIEW]->enabled;