Commit 7b347348 authored by Colin Ian King's avatar Colin Ian King Committed by Eric Anholt

drm: vc4: remove redundant check of plane being non-null

The pointer plane is always null on the error path at label 'fail'
hence the check if it is non-null is redundant. We can therefore
remove the check and the destruction of plane as well as the fail
error path and instead just return an -ENOMEM ERR_PTR.

Detected by CoverityScan, CID#1339532 ("Logically Dead Code")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Reviewed-by: default avatarEric Anholt <eric@anholt.net>
Link: http://patchwork.freedesktop.org/patch/msgid/20170316185418.32765-1-colin.king@canonical.com
parent cc2e6da1
...@@ -842,10 +842,8 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, ...@@ -842,10 +842,8 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev,
vc4_plane = devm_kzalloc(dev->dev, sizeof(*vc4_plane), vc4_plane = devm_kzalloc(dev->dev, sizeof(*vc4_plane),
GFP_KERNEL); GFP_KERNEL);
if (!vc4_plane) { if (!vc4_plane)
ret = -ENOMEM; return ERR_PTR(-ENOMEM);
goto fail;
}
for (i = 0; i < ARRAY_SIZE(hvs_formats); i++) { for (i = 0; i < ARRAY_SIZE(hvs_formats); i++) {
/* Don't allow YUV in cursor planes, since that means /* Don't allow YUV in cursor planes, since that means
...@@ -866,9 +864,4 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, ...@@ -866,9 +864,4 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev,
drm_plane_helper_add(plane, &vc4_plane_helper_funcs); drm_plane_helper_add(plane, &vc4_plane_helper_funcs);
return plane; return plane;
fail:
if (plane)
vc4_plane_destroy(plane);
return ERR_PTR(ret);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment