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>

diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
index 730386f0832a05be269e4d9055811fef9570404a..c9b6346111a5d9b60ab5f496d62b91bf9d0526ba 100644 (file)
--- 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;