aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.14/950-0398-staging-bcm2835-camera-Fix-multiple-line-dereference.patch
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2018-11-10 13:03:18 +0200
committerStijn Tintel <stijn@linux-ipv6.be>2018-12-18 23:19:21 +0200
commitf5919b65d4c671fd5083838c7a445f319f9a13c8 (patch)
tree2c791d2a5dea5bbbb0b85f86f74afce2647c0726 /target/linux/brcm2708/patches-4.14/950-0398-staging-bcm2835-camera-Fix-multiple-line-dereference.patch
parent822b4c3b250a254e74407056ccfd5c6aa38da162 (diff)
downloadupstream-f5919b65d4c671fd5083838c7a445f319f9a13c8.tar.gz
upstream-f5919b65d4c671fd5083838c7a445f319f9a13c8.tar.bz2
upstream-f5919b65d4c671fd5083838c7a445f319f9a13c8.zip
brcm2708: add kernel 4.14 support
Patch generation process: - rebase rpi/rpi-4.14.y on v4.14.89 from linux-stable - git format-patch v4.14.89 Patches skipped during rebase: - lan78xx: Read MAC address from DT if present - lan78xx: Enable LEDs and auto-negotiation - Revert "softirq: Let ksoftirqd do its job" - sc16is7xx: Fix for multi-channel stall - lan78xx: Ignore DT MAC address if already valid - lan78xx: Simple patch to prevent some crashes - tcp_write_queue_purge clears all the SKBs in the write queue - Revert "lan78xx: Simple patch to prevent some crashes" - lan78xx: Connect phy early - Arm: mm: ftrace: Only set text back to ro after kernel has been marked ro - Revert "Revert "softirq: Let ksoftirqd do its job"" - ASoC: cs4265: SOC_SINGLE register value error fix - Revert "ASoC: cs4265: SOC_SINGLE register value error fix" - Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends" - Revert "Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends"" Patches dropped after rebase: - net: Add non-mainline source for rtl8192cu wlan - net: Fix rtl8192cu build errors on other platforms - brcm: adds support for BCM43341 wifi - brcmfmac: Mute expected startup 'errors' - ARM64: Fix build break for RTL8187/RTL8192CU wifi - ARM64: Enable RTL8187/RTL8192CU wifi in build config - This is the driver for Sony CXD2880 DVB-T2/T tuner + demodulator - brcmfmac: add CLM download support - brcmfmac: request_firmware_direct is quieter - Sets the BCDC priority to constant 0 - brcmfmac: Disable ARP offloading when promiscuous - brcmfmac: Avoid possible out-of-bounds read - brcmfmac: Delete redundant length check - net: rtl8192cu: Normalize indentation - net: rtl8192cu: Fix implicit fallthrough warnings - Revert "Sets the BCDC priority to constant 0" - media: cxd2880: Bump to match 4.18.y version - media: cxd2880-spi: Bump to match 4.18.y version - Revert "mm: alloc_contig: re-allow CMA to compact FS pages" - Revert "Revert "mm: alloc_contig: re-allow CMA to compact FS pages"" - cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880 with MEDIA_SUBDRV_AUTOSELECT - 950-0421-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch - 950-0453-Add-hid-bigbenff-to-list-of-have_special_driver-for-.patch Make I2C built-in instead of modular as in upstream defconfig; also the easiest way to get MFD_ARIZONA enabled, which is required by kmod-sound-soc-rpi-cirrus. Add missing compatible strings from 4.9/960-add-rasbperrypi-compatible.patch, using upstream names for compute modules. Add extra patch to enable the LEDs on lan78xx. Compile-tested: bcm2708, bcm2709, bcm2710 (with CONFIG_ALL_KMODS=y) Runtime-tested: bcm2708, bcm2710 Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
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.patch133
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]);