[patch] drm/vc4: checking for NULL instead of IS_ERR

[patch] drm/vc4: checking for NULL instead of IS_ERR

[Dan Carpenter]

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: c8b75bca92cb ('Eric Anholt <eric@anholt.net>')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
index 7a9f476..0c363df 100644
--- a/drivers/gpu/drm/vc4/vc4_crtc.c
+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
@@ -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;

Re: [patch] drm/vc4: checking for NULL instead of IS_ERR

[Eric Anholt]

[-- Attachment #1: Type: text/plain, Size: 383 bytes --]

Dan Carpenter <dan.carpenter@oracle.com> writes:

> 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: c8b75bca92cb ('Eric Anholt <eric@anholt.net>')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Pulled this patch, should get it into 4.4.  Thanks!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 818 bytes --]