diff options
author | Daniela Mormocea <daniela.mormocea@gmail.com> | 2019-03-06 14:06:40 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-03-18 07:05:21 +0100 |
commit | b2c4f4660b698ad690df35f50091854072b8f514 (patch) | |
tree | 73c07f5f6446bb13368780fb2d99596eee35db34 /drivers/staging/vc04_services/bcm2835-camera | |
parent | d33fe112c9a26553f23275950f6d3521d40ad3df (diff) |
staging: vc04_services: bcm2835-camera: Fix logical continuations warnings
Break up lines after boolean operator
Signed-off-by: Daniela Mormocea <daniela.mormocea@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vc04_services/bcm2835-camera')
-rw-r--r-- | drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c index 730386f0832a..c9b6346111a5 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c @@ -512,8 +512,8 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count) msleep(300); /* enable the connection from camera to encoder (if applicable) */ - if (dev->capture.camera_port != dev->capture.port - && dev->capture.camera_port) { + if (dev->capture.camera_port != dev->capture.port && + dev->capture.camera_port) { ret = vchiq_mmal_port_enable(dev->instance, dev->capture.camera_port, NULL); if (ret) { @@ -1009,8 +1009,8 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev, switch (mfmt->mmal_component) { case MMAL_COMPONENT_CAMERA: /* Make a further decision on port based on resolution */ - if (f->fmt.pix.width <= max_video_width - && f->fmt.pix.height <= max_video_height) + if (f->fmt.pix.width <= max_video_width && + f->fmt.pix.height <= max_video_height) camera_port = port = &dev->component[MMAL_COMPONENT_CAMERA]->output[MMAL_CAMERA_PORT_VIDEO]; else @@ -1067,8 +1067,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[MMAL_COMPONENT_CAMERA]->output[MMAL_CAMERA_PORT_VIDEO]) { bool overlay_enabled = !!dev->component[MMAL_COMPONENT_PREVIEW]->enabled; |