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.
28 lines
983 B
Diff
28 lines
983 B
Diff
From 88e3479406637f8461fd026196f7bc5d4bf81cf9 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] 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>
|
|
---
|
|
drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
|
|
+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
|
|
@@ -1114,8 +1114,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;
|