Skip to content

Commit

Permalink
drm/vc4: simplify exit path of a failed allocation of dsi_connector
Browse files Browse the repository at this point in the history
If dsi_connector fails to allocate, the exit path via label 'fail'
checks if connector is null, which it always is, so the cleanup
that destroys connector is never going to be called.  Hence the
failure path can be more optimally performed by removing this
and just returning ERR_PTR(-ENOMEM).  This also removes the need
to initialize connector to NULL, and we can also remove ret too.

Detected by CoverityScan, CID#1399504 ("Logicall Dead Code")

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170203195624.7189-1-colin.king@canonical.com
  • Loading branch information
Colin Ian King authored and anholt committed Feb 7, 2017
1 parent 64b0e1d commit fce6a7b
Showing 1 changed file with 4 additions and 12 deletions.
16 changes: 4 additions & 12 deletions drivers/gpu/drm/vc4/vc4_dsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -771,16 +771,14 @@ static const struct drm_connector_helper_funcs vc4_dsi_connector_helper_funcs =
static struct drm_connector *vc4_dsi_connector_init(struct drm_device *dev,
struct vc4_dsi *dsi)
{
struct drm_connector *connector = NULL;
struct drm_connector *connector;
struct vc4_dsi_connector *dsi_connector;
int ret = 0;

dsi_connector = devm_kzalloc(dev->dev, sizeof(*dsi_connector),
GFP_KERNEL);
if (!dsi_connector) {
ret = -ENOMEM;
goto fail;
}
if (!dsi_connector)
return ERR_PTR(-ENOMEM);

connector = &dsi_connector->base;

dsi_connector->dsi = dsi;
Expand All @@ -796,12 +794,6 @@ static struct drm_connector *vc4_dsi_connector_init(struct drm_device *dev,
drm_mode_connector_attach_encoder(connector, dsi->encoder);

return connector;

fail:
if (connector)
vc4_dsi_connector_destroy(connector);

return ERR_PTR(ret);
}

static void vc4_dsi_encoder_destroy(struct drm_encoder *encoder)
Expand Down

0 comments on commit fce6a7b

Please sign in to comment.