Commit b2c4f466 authored by Daniela Mormocea's avatar Daniela Mormocea Committed by Greg Kroah-Hartman

staging: vc04_services: bcm2835-camera: Fix logical continuations warnings

Break up lines after boolean operator
Signed-off-by: default avatarDaniela Mormocea <daniela.mormocea@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d33fe112
...@@ -512,8 +512,8 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count) ...@@ -512,8 +512,8 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
msleep(300); msleep(300);
/* enable the connection from camera to encoder (if applicable) */ /* enable the connection from camera to encoder (if applicable) */
if (dev->capture.camera_port != dev->capture.port if (dev->capture.camera_port != dev->capture.port &&
&& dev->capture.camera_port) { dev->capture.camera_port) {
ret = vchiq_mmal_port_enable(dev->instance, ret = vchiq_mmal_port_enable(dev->instance,
dev->capture.camera_port, NULL); dev->capture.camera_port, NULL);
if (ret) { if (ret) {
...@@ -1009,8 +1009,8 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev, ...@@ -1009,8 +1009,8 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev,
switch (mfmt->mmal_component) { switch (mfmt->mmal_component) {
case MMAL_COMPONENT_CAMERA: case MMAL_COMPONENT_CAMERA:
/* Make a further decision on port based on resolution */ /* Make a further decision on port based on resolution */
if (f->fmt.pix.width <= max_video_width if (f->fmt.pix.width <= max_video_width &&
&& f->fmt.pix.height <= max_video_height) f->fmt.pix.height <= max_video_height)
camera_port = port = camera_port = port =
&dev->component[MMAL_COMPONENT_CAMERA]->output[MMAL_CAMERA_PORT_VIDEO]; &dev->component[MMAL_COMPONENT_CAMERA]->output[MMAL_CAMERA_PORT_VIDEO];
else else
...@@ -1067,8 +1067,8 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev, ...@@ -1067,8 +1067,8 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev,
ret = vchiq_mmal_port_set_format(dev->instance, camera_port); ret = vchiq_mmal_port_set_format(dev->instance, camera_port);
if (!ret if (!ret &&
&& camera_port == camera_port ==
&dev->component[MMAL_COMPONENT_CAMERA]->output[MMAL_CAMERA_PORT_VIDEO]) { &dev->component[MMAL_COMPONENT_CAMERA]->output[MMAL_CAMERA_PORT_VIDEO]) {
bool overlay_enabled = bool overlay_enabled =
!!dev->component[MMAL_COMPONENT_PREVIEW]->enabled; !!dev->component[MMAL_COMPONENT_PREVIEW]->enabled;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment