aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.14/950-0377-staging-bcm2835-camera-Fix-warnings-about-string-ops.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-0377-staging-bcm2835-camera-Fix-warnings-about-string-ops.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-0377-staging-bcm2835-camera-Fix-warnings-about-string-ops.patch')
-rw-r--r--target/linux/brcm2708/patches-4.14/950-0377-staging-bcm2835-camera-Fix-warnings-about-string-ops.patch61
1 files changed, 61 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0377-staging-bcm2835-camera-Fix-warnings-about-string-ops.patch b/target/linux/brcm2708/patches-4.14/950-0377-staging-bcm2835-camera-Fix-warnings-about-string-ops.patch
new file mode 100644
index 0000000000..4cdef53f98
--- /dev/null
+++ b/target/linux/brcm2708/patches-4.14/950-0377-staging-bcm2835-camera-Fix-warnings-about-string-ops.patch
@@ -0,0 +1,61 @@
+From 2c6ce48e18a2a95743de7a84faefd52d090c2a56 Mon Sep 17 00:00:00 2001
+From: Eric Anholt <eric@anholt.net>
+Date: Thu, 10 May 2018 12:42:18 -0700
+Subject: [PATCH 377/454] staging: bcm2835-camera: Fix warnings about string
+ ops on v4l2 uapi.
+
+commit 40b73e16675ee2e77358ed1cfc3364c8bf000e4f upstream.
+
+The v4l2 uapi uses u8[] for strings, so cast those to char * to avoid
+compiler warnings about unsigned vs signed with sprintf() and friends.
+
+Signed-off-by: Eric Anholt <eric@anholt.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ .../vc04_services/bcm2835-camera/bcm2835-camera.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
++++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
+@@ -726,7 +726,7 @@ static int vidioc_enum_fmt_vid_overlay(s
+
+ fmt = &formats[f->index];
+
+- strlcpy(f->description, fmt->name, sizeof(f->description));
++ strlcpy((char *)f->description, fmt->name, sizeof(f->description));
+ f->pixelformat = fmt->fourcc;
+ f->flags = fmt->flags;
+
+@@ -884,7 +884,7 @@ static int vidioc_enum_input(struct file
+ return -EINVAL;
+
+ inp->type = V4L2_INPUT_TYPE_CAMERA;
+- sprintf(inp->name, "Camera %u", inp->index);
++ sprintf((char *)inp->name, "Camera %u", inp->index);
+ return 0;
+ }
+
+@@ -912,11 +912,11 @@ static int vidioc_querycap(struct file *
+
+ vchiq_mmal_version(dev->instance, &major, &minor);
+
+- strcpy(cap->driver, "bm2835 mmal");
+- snprintf(cap->card, sizeof(cap->card), "mmal service %d.%d",
++ strcpy((char *)cap->driver, "bm2835 mmal");
++ snprintf((char *)cap->card, sizeof(cap->card), "mmal service %d.%d",
+ major, minor);
+
+- snprintf(cap->bus_info, sizeof(cap->bus_info),
++ snprintf((char *)cap->bus_info, sizeof(cap->bus_info),
+ "platform:%s", dev->v4l2_dev.name);
+ cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OVERLAY |
+ V4L2_CAP_STREAMING | V4L2_CAP_READWRITE;
+@@ -935,7 +935,7 @@ static int vidioc_enum_fmt_vid_cap(struc
+
+ fmt = &formats[f->index];
+
+- strlcpy(f->description, fmt->name, sizeof(f->description));
++ strlcpy((char *)f->description, fmt->name, sizeof(f->description));
+ f->pixelformat = fmt->fourcc;
+ f->flags = fmt->flags;
+