Skip to content

Commit

Permalink
drm/vc4: clean up error handling on devm_kzalloc failure
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Colin Ian King authored and anholt committed Sep 8, 2017
1 parent 45ae278 commit 5663077
Showing 1 changed file with 3 additions and 12 deletions.
15 changes: 3 additions & 12 deletions drivers/gpu/drm/vc4/vc4_hdmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -309,16 +309,13 @@ static const struct drm_connector_helper_funcs vc4_hdmi_connector_helper_funcs =
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;
Expand All @@ -336,12 +333,6 @@ static struct drm_connector *vc4_hdmi_connector_init(struct drm_device *dev,
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)
Expand Down

0 comments on commit 5663077

Please sign in to comment.