diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2015-11-04 16:21:40 +0300 |
|---|---|---|
| committer |   Eric Anholt <eric@anholt.net> | 2015-11-17 12:26:49 -0800 |
| commit | 79513237da7ecc0981e7d962a784625b32cabfdc (patch) | |
| tree | 0fc4ac6a9b8b4f6e3a436f4bf8aced38a03cbd27 /drivers | |
| parent | drm/vc4: fix itnull.cocci warnings (diff) | |
| download | linux-dev-79513237da7ecc0981e7d962a784625b32cabfdc.tar.xz linux-dev-79513237da7ecc0981e7d962a784625b32cabfdc.zip | |
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: c8b75bca92cb ('Eric Anholt <eric@anholt.net>')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_crtc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c index f794c5b6996b..f77fa9ebab29 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; |