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

   1 From e0f8234cf59fcdcafe93bdfcf10409e46eb3853f Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
   3 Date: Wed, 21 Feb 2018 15:48:54 +0000
   4 Subject: [PATCH 250/773] staging: bcm2835-camera: Fix logical continuation
   5  splits
   6
   7 Fix checkpatch errors for "Logical continuations should be
   8 on the previous line".
   9
  10 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  11 ---
  12  .../vc04_services/bcm2835-camera/bcm2835-camera.c    | 12 ++++++------
  13  1 file changed, 6 insertions(+), 6 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 @@ -545,8 +545,8 @@ static int start_streaming(struct vb2_qu
  18                 msleep(300);
  19
  20         /* enable the connection from camera to encoder (if applicable) */
  21 -       if (dev->capture.camera_port != dev->capture.port
  22 -           && dev->capture.camera_port) {
  23 +       if (dev->capture.camera_port != dev->capture.port &&
  24 +           dev->capture.camera_port) {
  25                 ret = vchiq_mmal_port_enable(dev->instance,
  26                                              dev->capture.camera_port, NULL);
  27                 if (ret) {
  28 @@ -1056,8 +1056,8 @@ static int mmal_setup_components(struct
  29         switch (mfmt->mmal_component) {
  30         case COMP_CAMERA:
  31                 /* Make a further decision on port based on resolution */
  32 -               if (f->fmt.pix.width <= max_video_width
  33 -                   && f->fmt.pix.height <= max_video_height)
  34 +               if (f->fmt.pix.width <= max_video_width &&
  35 +                   f->fmt.pix.height <= max_video_height)
  36                         camera_port = port =
  37                             &dev->component[COMP_CAMERA]->output[CAM_PORT_VIDEO];
  38                 else
  39 @@ -1114,8 +1114,8 @@ static int mmal_setup_components(struct
  40
  41         ret = vchiq_mmal_port_set_format(dev->instance, camera_port);
  42
  43 -       if (!ret
  44 -           && camera_port ==
  45 +       if (!ret &&
  46 +           camera_port ==
  47             &dev->component[COMP_CAMERA]->output[CAM_PORT_VIDEO]) {
  48                 bool overlay_enabled =
  49                     !!dev->component[COMP_PREVIEW]->enabled;