target/linux/brcm2708/patches-4.19/950-0248-staging-bcm2835-camera-Fix-brace-style-issues.patch

   1 From b9702c9018656a2145bf18ad997d59f03f606bee Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
   3 Date: Wed, 21 Feb 2018 15:37:11 +0000
   4 Subject: [PATCH 248/703] staging: bcm2835-camera: Fix brace style issues.
   5
   6 Fix mismatched or missing brace issues flagged by checkpatch.
   7
   8 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
   9 ---
  10  drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 3 ++-
  11  drivers/staging/vc04_services/bcm2835-camera/controls.c       | 3 ++-
  12  drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c     | 3 ++-
  13  3 files changed, 6 insertions(+), 3 deletions(-)
  14
  15 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
  16 +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
  17 @@ -566,10 +566,11 @@ static int start_streaming(struct vb2_qu
  18
  19                 /* Flag to indicate just to rely on kernel timestamps */
  20                 dev->capture.vc_start_timestamp = -1;
  21 -       } else
  22 +       } else {
  23                 v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
  24                          "Start time %lld size %d\n",
  25                          dev->capture.vc_start_timestamp, parameter_size);
  26 +       }
  27
  28         dev->capture.kernel_start_ts = ktime_get();
  29         dev->capture.last_timestamp = 0;
  30 --- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
  31 +++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
  32 @@ -410,8 +410,9 @@ static int ctrl_set_metering_mode(struct
  33                 return vchiq_mmal_port_parameter_set(dev->instance, control,
  34                                              mmal_ctrl->mmal_id,
  35                                              &u32_value, sizeof(u32_value));
  36 -       } else
  37 +       } else {
  38                 return 0;
  39 +       }
  40  }
  41
  42  static int ctrl_set_flicker_avoidance(struct bm2835_mmal_dev *dev,
  43 --- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
  44 +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
  45 @@ -1262,9 +1262,10 @@ static int port_parameter_get(struct vch
  46                 memcpy(value, &rmsg->u.port_parameter_get_reply.value,
  47                        *value_size);
  48                 *value_size = rmsg->u.port_parameter_get_reply.size;
  49 -       } else
  50 +       } else {
  51                 memcpy(value, &rmsg->u.port_parameter_get_reply.value,
  52                        rmsg->u.port_parameter_get_reply.size);
  53 +       }
  54
  55         pr_debug("%s:result:%d component:0x%x port:%d parameter:%d\n", __func__,
  56                  ret, port->component->handle, port->handle, parameter_id);