brcm2708: organize kernel patches
[openwrt/staging/chunkeey.git] / target / linux / brcm2708 / patches-4.19 / 950-0228-staging-bcm2835-camera-Fix-brace-style-issues.patch
diff --git a/target/linux/brcm2708/patches-4.19/950-0228-staging-bcm2835-camera-Fix-brace-style-issues.patch b/target/linux/brcm2708/patches-4.19/950-0228-staging-bcm2835-camera-Fix-brace-style-issues.patch
new file mode 100644 (file)
index 0000000..6aa8e93
--- /dev/null
@@ -0,0 +1,56 @@
+From a023ee926b7e923058203e82edc5405c1e82842c Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.org>
+Date: Wed, 21 Feb 2018 15:37:11 +0000
+Subject: [PATCH] staging: bcm2835-camera: Fix brace style issues.
+
+Fix mismatched or missing brace issues flagged by checkpatch.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
+---
+ drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 3 ++-
+ drivers/staging/vc04_services/bcm2835-camera/controls.c       | 3 ++-
+ drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c     | 3 ++-
+ 3 files changed, 6 insertions(+), 3 deletions(-)
+
+--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
++++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
+@@ -569,10 +569,11 @@ static int start_streaming(struct vb2_qu
+               /* Flag to indicate just to rely on kernel timestamps */
+               dev->capture.vc_start_timestamp = -1;
+-      } else
++      } else {
+               v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
+                        "Start time %lld size %d\n",
+                        dev->capture.vc_start_timestamp, parameter_size);
++      }
+       dev->capture.kernel_start_ts = ktime_get();
+       dev->capture.last_timestamp = 0;
+--- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
++++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
+@@ -410,8 +410,9 @@ static int ctrl_set_metering_mode(struct
+               return vchiq_mmal_port_parameter_set(dev->instance, control,
+                                            mmal_ctrl->mmal_id,
+                                            &u32_value, sizeof(u32_value));
+-      } else
++      } else {
+               return 0;
++      }
+ }
+ static int ctrl_set_flicker_avoidance(struct bm2835_mmal_dev *dev,
+--- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
++++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
+@@ -1268,9 +1268,10 @@ static int port_parameter_get(struct vch
+               memcpy(value, &rmsg->u.port_parameter_get_reply.value,
+                      *value_size);
+               *value_size = rmsg->u.port_parameter_get_reply.size;
+-      } else
++      } else {
+               memcpy(value, &rmsg->u.port_parameter_get_reply.value,
+                      rmsg->u.port_parameter_get_reply.size);
++      }
+       pr_debug("%s:result:%d component:0x%x port:%d parameter:%d\n", __func__,
+                ret, port->component->handle, port->handle, parameter_id);