Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79513237 authored by Dan Carpenter's avatar Dan Carpenter Committed by Eric Anholt
Browse files

drm/vc4: checking for NULL instead of IS_ERR 



vc4_plane_init() returns an ERR_PTR on error, it doesn't return NULL.
This was obviously intended because the next lines call
PTR_ERR(primary_plane) already.

Fixes: c8b75bca ('Eric Anholt <eric@anholt.net>')
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 2fa8e904

drivers/gpu/drm/vc4/vc4_crtc.c

+2 −2
Original line number Diff line number Diff line
@@ -591,14 +591,14 @@ static int vc4_crtc_bind(struct device *dev, struct device *master, void *data) 
	 * that will take too much.

	 */

	primary_plane = vc4_plane_init(drm, DRM_PLANE_TYPE_PRIMARY);

	if (!primary_plane) {

	if (IS_ERR(primary_plane)) {

		dev_err(dev, "failed to construct primary plane\n");

		ret = PTR_ERR(primary_plane);

		goto err;

	}



	cursor_plane = vc4_plane_init(drm, DRM_PLANE_TYPE_CURSOR);

	if (!cursor_plane) {

	if (IS_ERR(cursor_plane)) {

		dev_err(dev, "failed to construct cursor plane\n");

		ret = PTR_ERR(cursor_plane);

		goto err_primary;