mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 14:13:16 +00:00
f5919b65d4
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>
58 lines
2.0 KiB
Diff
58 lines
2.0 KiB
Diff
From 628487eea01248eb722b46636a4b0fe45caaf24f Mon Sep 17 00:00:00 2001
|
|
From: Colin Ian King <colin.king@canonical.com>
|
|
Date: Fri, 8 Sep 2017 15:05:04 +0100
|
|
Subject: [PATCH 173/454] drm/vc4: clean up error handling on devm_kzalloc
|
|
failure
|
|
|
|
The current error handling when devm_kzalloc fails performs a
|
|
non-null check on connector which is redundant because connector
|
|
is null at that failure point. Once this is removed, make the
|
|
failure path into a trivial -ENOMEM return to clean up the
|
|
error handling. Also remove need to initialize connector to NULL.
|
|
|
|
Detected by CoverityScan CID#1339527 ("Logically dead code")
|
|
Signed-off-by: Colin Ian King <colin.king@canonical.com>
|
|
Signed-off-by: Eric Anholt <eric@anholt.net>
|
|
Reviewed-by: Eric Anholt <eric@anholt.net>
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/20170908140504.1340-1-colin.king@canonical.com
|
|
(cherry picked from commit 5663077a56804890506c913b3ca9fee78764f8b3)
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 15 +++------------
|
|
1 file changed, 3 insertions(+), 12 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -309,16 +309,13 @@ static const struct drm_connector_helper
|
|
static struct drm_connector *vc4_hdmi_connector_init(struct drm_device *dev,
|
|
struct drm_encoder *encoder)
|
|
{
|
|
- struct drm_connector *connector = NULL;
|
|
+ struct drm_connector *connector;
|
|
struct vc4_hdmi_connector *hdmi_connector;
|
|
- int ret = 0;
|
|
|
|
hdmi_connector = devm_kzalloc(dev->dev, sizeof(*hdmi_connector),
|
|
GFP_KERNEL);
|
|
- if (!hdmi_connector) {
|
|
- ret = -ENOMEM;
|
|
- goto fail;
|
|
- }
|
|
+ if (!hdmi_connector)
|
|
+ return ERR_PTR(-ENOMEM);
|
|
connector = &hdmi_connector->base;
|
|
|
|
hdmi_connector->encoder = encoder;
|
|
@@ -336,12 +333,6 @@ static struct drm_connector *vc4_hdmi_co
|
|
drm_mode_connector_attach_encoder(connector, encoder);
|
|
|
|
return connector;
|
|
-
|
|
- fail:
|
|
- if (connector)
|
|
- vc4_hdmi_connector_destroy(connector);
|
|
-
|
|
- return ERR_PTR(ret);
|
|
}
|
|
|
|
static void vc4_hdmi_encoder_destroy(struct drm_encoder *encoder)
|