diff options
Diffstat (limited to 'target/linux/brcm2708/patches-4.14/950-0173-drm-vc4-clean-up-error-handling-on-devm_kzalloc-fail.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.14/950-0173-drm-vc4-clean-up-error-handling-on-devm_kzalloc-fail.patch | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0173-drm-vc4-clean-up-error-handling-on-devm_kzalloc-fail.patch b/target/linux/brcm2708/patches-4.14/950-0173-drm-vc4-clean-up-error-handling-on-devm_kzalloc-fail.patch deleted file mode 100644 index 8976e2a36d..0000000000 --- a/target/linux/brcm2708/patches-4.14/950-0173-drm-vc4-clean-up-error-handling-on-devm_kzalloc-fail.patch +++ /dev/null @@ -1,57 +0,0 @@ -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) |