diff options
Diffstat (limited to 'target/linux/brcm2708/patches-4.14/950-0398-staging-bcm2835-camera-Fix-multiple-line-dereference.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.14/950-0398-staging-bcm2835-camera-Fix-multiple-line-dereference.patch | 133 |
1 files changed, 133 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0398-staging-bcm2835-camera-Fix-multiple-line-dereference.patch b/target/linux/brcm2708/patches-4.14/950-0398-staging-bcm2835-camera-Fix-multiple-line-dereference.patch new file mode 100644 index 0000000000..196d8581f7 --- /dev/null +++ b/target/linux/brcm2708/patches-4.14/950-0398-staging-bcm2835-camera-Fix-multiple-line-dereference.patch @@ -0,0 +1,133 @@ +From 792e9e31a64c32d70b79afaa24d9ad3e96a39ff6 Mon Sep 17 00:00:00 2001 +From: Dave Stevenson <dave.stevenson@raspberrypi.org> +Date: Wed, 21 Feb 2018 15:28:07 +0000 +Subject: [PATCH 398/454] staging: bcm2835-camera: Fix multiple line + dereference errors + +Fix checkpatch errors "Avoid multiple line dereference" + +Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> +--- + .../bcm2835-camera/bcm2835-camera.c | 41 +++++++------------ + 1 file changed, 14 insertions(+), 27 deletions(-) + +--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c ++++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +@@ -320,8 +320,7 @@ static void buffer_cleanup(struct vb2_bu + static inline bool is_capturing(struct bm2835_mmal_dev *dev) + { + return dev->capture.camera_port == +- &dev-> +- component[COMP_CAMERA]->output[CAM_PORT_CAPTURE]; ++ &dev->component[COMP_CAMERA]->output[CAM_PORT_CAPTURE]; + } + + static void buffer_cb(struct vchiq_mmal_instance *instance, +@@ -804,8 +803,7 @@ static int vidioc_overlay(struct file *f + return 0; /* already in requested state */ + + src = +- &dev->component[COMP_CAMERA]-> +- output[CAM_PORT_PREVIEW]; ++ &dev->component[COMP_CAMERA]->output[CAM_PORT_PREVIEW]; + + if (!on) { + /* disconnect preview ports and disable component */ +@@ -860,8 +858,7 @@ static int vidioc_g_fbuf(struct file *fi + */ + struct bm2835_mmal_dev *dev = video_drvdata(file); + struct vchiq_mmal_port *preview_port = +- &dev->component[COMP_CAMERA]-> +- output[CAM_PORT_PREVIEW]; ++ &dev->component[COMP_CAMERA]->output[CAM_PORT_PREVIEW]; + + a->capability = V4L2_FBUF_CAP_EXTERNOVERLAY | + V4L2_FBUF_CAP_GLOBAL_ALPHA; +@@ -1053,8 +1050,7 @@ static int mmal_setup_components(struct + dev->capture.camera_port, NULL); + dev->capture.camera_port = NULL; + ret = vchiq_mmal_component_disable(dev->instance, +- dev->capture. +- encode_component); ++ dev->capture.encode_component); + if (ret) + v4l2_err(&dev->v4l2_dev, + "Failed to disable encode component %d\n", +@@ -1069,26 +1065,22 @@ static int mmal_setup_components(struct + if (f->fmt.pix.width <= max_video_width + && f->fmt.pix.height <= max_video_height) + camera_port = port = +- &dev->component[COMP_CAMERA]-> +- output[CAM_PORT_VIDEO]; ++ &dev->component[COMP_CAMERA]->output[CAM_PORT_VIDEO]; + else + camera_port = port = +- &dev->component[COMP_CAMERA]-> +- output[CAM_PORT_CAPTURE]; ++ &dev->component[COMP_CAMERA]->output[CAM_PORT_CAPTURE]; + break; + case COMP_IMAGE_ENCODE: + encode_component = dev->component[COMP_IMAGE_ENCODE]; + port = &dev->component[COMP_IMAGE_ENCODE]->output[0]; + camera_port = +- &dev->component[COMP_CAMERA]-> +- output[CAM_PORT_CAPTURE]; ++ &dev->component[COMP_CAMERA]->output[CAM_PORT_CAPTURE]; + break; + case COMP_VIDEO_ENCODE: + encode_component = dev->component[COMP_VIDEO_ENCODE]; + port = &dev->component[COMP_VIDEO_ENCODE]->output[0]; + camera_port = +- &dev->component[COMP_CAMERA]-> +- output[CAM_PORT_VIDEO]; ++ &dev->component[COMP_CAMERA]->output[CAM_PORT_VIDEO]; + break; + default: + break; +@@ -1130,8 +1122,7 @@ static int mmal_setup_components(struct + + if (!ret + && camera_port == +- &dev->component[COMP_CAMERA]-> +- output[CAM_PORT_VIDEO]) { ++ &dev->component[COMP_CAMERA]->output[CAM_PORT_VIDEO]) { + bool overlay_enabled = + !!dev->component[COMP_PREVIEW]->enabled; + struct vchiq_mmal_port *preview_port = +@@ -1268,9 +1259,8 @@ static int mmal_setup_components(struct + port->current_buffer.size); + port->current_buffer.size = + (f->fmt.pix.sizeimage < +- (100 << 10)) +- ? (100 << 10) +- : f->fmt.pix.sizeimage; ++ (100 << 10)) ? ++ (100 << 10) : f->fmt.pix.sizeimage; + } + v4l2_dbg(1, bcm2835_v4l2_debug, + &dev->v4l2_dev, +@@ -1721,8 +1711,7 @@ static int __init mmal_init(struct bm283 + + /* get the video encoder component ready */ + ret = vchiq_mmal_component_init(dev->instance, "ril.video_encode", +- &dev-> +- component[COMP_VIDEO_ENCODE]); ++ &dev->component[COMP_VIDEO_ENCODE]); + if (ret < 0) + goto unreg_image_encoder; + +@@ -1842,12 +1831,10 @@ static void bcm2835_cleanup_instance(str + dev->component[COMP_CAMERA]); + + vchiq_mmal_component_finalise(dev->instance, +- dev-> +- component[COMP_VIDEO_ENCODE]); ++ dev->component[COMP_VIDEO_ENCODE]); + + vchiq_mmal_component_finalise(dev->instance, +- dev-> +- component[COMP_IMAGE_ENCODE]); ++ dev->component[COMP_IMAGE_ENCODE]); + + vchiq_mmal_component_finalise(dev->instance, + dev->component[COMP_PREVIEW]); |