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.
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
From d1f9d21346c642fadb2676077b050106afaf7579 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
Date: Mon, 29 Oct 2018 15:58:14 +0000
|
|
Subject: [PATCH] staging: bcm2835-camera: Fix multiple assignments
|
|
should be avoided
|
|
|
|
Clear checkpatch complaints of "multiple assignments should be avoided"
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
---
|
|
.../staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
|
|
+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
|
|
@@ -1065,11 +1065,12 @@ static int mmal_setup_components(struct
|
|
/* Make a further decision on port based on resolution */
|
|
if (f->fmt.pix.width <= max_video_width &&
|
|
f->fmt.pix.height <= max_video_height)
|
|
- camera_port = port =
|
|
+ camera_port =
|
|
&dev->component[COMP_CAMERA]->output[CAM_PORT_VIDEO];
|
|
else
|
|
- camera_port = port =
|
|
+ camera_port =
|
|
&dev->component[COMP_CAMERA]->output[CAM_PORT_CAPTURE];
|
|
+ port = camera_port;
|
|
break;
|
|
case COMP_IMAGE_ENCODE:
|
|
encode_component = dev->component[COMP_IMAGE_ENCODE];
|