You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
50 lines
1.8 KiB
Diff
50 lines
1.8 KiB
Diff
6 years ago
|
From 7038689f4826a41b25f30ec416ab0b7ba0a4758c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
||
|
|
Date: Wed, 21 Feb 2018 15:48:54 +0000
|
||
|
|
Subject: [PATCH 401/454] staging: bcm2835-camera: Fix logical continuation
|
||
|
|
splits
|
||
|
|
|
||
|
|
Fix checkpatch errors for "Logical continuations should be
|
||
|
|
on the previous line".
|
||
|
|
|
||
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
||
|
|
---
|
||
|
|
.../vc04_services/bcm2835-camera/bcm2835-camera.c | 12 ++++++------
|
||
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
|
||
|
|
+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
|
||
|
|
@@ -549,8 +549,8 @@ static int start_streaming(struct vb2_qu
|
||
|
|
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) {
|
||
|
|
@@ -1063,8 +1063,8 @@ static int mmal_setup_components(struct
|
||
|
|
switch (mfmt->mmal_component) {
|
||
|
|
case COMP_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[COMP_CAMERA]->output[CAM_PORT_VIDEO];
|
||
|
|
else
|
||
|
|
@@ -1121,8 +1121,8 @@ static int mmal_setup_components(struct
|
||
|
|
|
||
|
|
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;
|