git.openwrt.org Git - openwrt/staging/xback.git/blob

   1 From 816336e4081a5180c5b8524b2839e31f43a5ddf8 Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
   3 Date: Mon, 29 Oct 2018 15:58:14 +0000
   4 Subject: [PATCH 259/725] staging: bcm2835-camera: Fix multiple assignments
   5  should be avoided
   6
   7 Clear checkpatch complaints of "multiple assignments should be avoided"
   8
   9 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  10 ---
  11  .../staging/vc04_services/bcm2835-camera/bcm2835-camera.c    | 5 +++--
  12  1 file changed, 3 insertions(+), 2 deletions(-)
  13
  14 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
  15 +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
  16 @@ -1065,11 +1065,12 @@ static int mmal_setup_components(struct
  17                 /* Make a further decision on port based on resolution */
  18                 if (f->fmt.pix.width <= max_video_width &&
  19                     f->fmt.pix.height <= max_video_height)
  20 -                       camera_port = port =
  21 +                       camera_port =
  22                             &dev->component[COMP_CAMERA]->output[CAM_PORT_VIDEO];
  23                 else
  24 -                       camera_port = port =
  25 +                       camera_port =
  26                             &dev->component[COMP_CAMERA]->output[CAM_PORT_CAPTURE];
  27 +               port = camera_port;
  28                 break;
  29         case COMP_IMAGE_ENCODE:
  30                 encode_component = dev->component[COMP_IMAGE_ENCODE];