aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.14/950-0400-staging-bcm2835-camera-Fix-missing-lines-between-ite.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/brcm2708/patches-4.14/950-0400-staging-bcm2835-camera-Fix-missing-lines-between-ite.patch')
-rw-r--r--target/linux/brcm2708/patches-4.14/950-0400-staging-bcm2835-camera-Fix-missing-lines-between-ite.patch61
1 files changed, 61 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0400-staging-bcm2835-camera-Fix-missing-lines-between-ite.patch b/target/linux/brcm2708/patches-4.14/950-0400-staging-bcm2835-camera-Fix-missing-lines-between-ite.patch
new file mode 100644
index 0000000000..55b301ee6f
--- /dev/null
+++ b/target/linux/brcm2708/patches-4.14/950-0400-staging-bcm2835-camera-Fix-missing-lines-between-ite.patch
@@ -0,0 +1,61 @@
+From 52499594ce8b48c434bed29062c8bbc15b96cc96 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.org>
+Date: Wed, 21 Feb 2018 15:39:26 +0000
+Subject: [PATCH 400/454] staging: bcm2835-camera: Fix missing lines between
+ items
+
+Fix checkpatch errors for missing blank lines after variable
+or structure declarations.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
+---
+ .../staging/vc04_services/bcm2835-camera/bcm2835-camera.h | 1 +
+ drivers/staging/vc04_services/bcm2835-camera/controls.c | 2 ++
+ drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c | 6 ++++--
+ 3 files changed, 7 insertions(+), 2 deletions(-)
+
+--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
++++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
+@@ -133,6 +133,7 @@ int set_framerate_params(struct bm2835_m
+ (pix_fmt)->pixelformat, (pix_fmt)->bytesperline, \
+ (pix_fmt)->sizeimage, (pix_fmt)->colorspace, (pix_fmt)->priv); \
+ }
++
+ #define v4l2_dump_win_format(level, debug, dev, win_fmt, desc) \
+ { \
+ v4l2_dbg(level, debug, dev, \
+--- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
++++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
+@@ -56,6 +56,7 @@ static const s64 ev_bias_qmenu[] = {
+ static const s64 iso_qmenu[] = {
+ 0, 100000, 200000, 400000, 800000,
+ };
++
+ static const uint32_t iso_values[] = {
+ 0, 100, 200, 400, 800,
+ };
+@@ -1272,6 +1273,7 @@ int bm2835_mmal_init_controls(struct bm2
+ * mismatches.
+ */
+ int i;
++
+ mask = 1 << V4L2_SCENE_MODE_NONE;
+ for (i = 0;
+ i < ARRAY_SIZE(scene_configs);
+--- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
++++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
+@@ -1886,10 +1886,12 @@ int vchiq_mmal_finalise(struct vchiq_mma
+
+ int vchiq_mmal_init(struct vchiq_mmal_instance **out_instance)
+ {
+- int status;
+- struct vchiq_mmal_instance *instance;
+ static VCHI_CONNECTION_T *vchi_connection;
++
+ static VCHI_INSTANCE_T vchi_instance;
++
++ struct vchiq_mmal_instance *instance;
++ int status;
+ SERVICE_CREATION_T params = {
+ .version = VCHI_VERSION_EX(VC_MMAL_VER, VC_MMAL_MIN_VER),
+ .service_id = VC_MMAL_SERVER_NAME,