From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Tue, 26 Mar 2019 05:08:43 +0000 Subject: [PATCH] drm/i915/selftests: Fix an IS_ERR() vs NULL check Message-Id: <20190326050843.GA20038@kadam> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Jani Nikula , Chris Wilson Cc: kernel-janitors@vger.kernel.org, David Airlie , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Thomas Zimmermann The live_context() function returns error pointers. It never returns NULL. Fixes: 9c1477e83e62 ("drm/i915/selftests: Exercise adding requests to a full GGTT") Signed-off-by: Dan Carpenter --- drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_evict.c b/drivers/gpu/drm/i915/selftests/i915_gem_evict.c index 9a9451846b33..89766688e420 100644 --- a/drivers/gpu/drm/i915/selftests/i915_gem_evict.c +++ b/drivers/gpu/drm/i915/selftests/i915_gem_evict.c @@ -455,7 +455,7 @@ static int igt_evict_contexts(void *arg) struct i915_gem_context *ctx; ctx = live_context(i915, file); - if (!ctx) + if (IS_ERR(ctx)) break; /* We will need some GGTT space for the rq's context */ -- 2.17.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [PATCH] drm/i915/selftests: Fix an IS_ERR() vs NULL check Date: Tue, 26 Mar 2019 08:08:43 +0300 Message-ID: <20190326050843.GA20038@kadam> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Jani Nikula , Chris Wilson Cc: kernel-janitors@vger.kernel.org, David Airlie , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Thomas Zimmermann List-Id: dri-devel@lists.freedesktop.org VGhlIGxpdmVfY29udGV4dCgpIGZ1bmN0aW9uIHJldHVybnMgZXJyb3IgcG9pbnRlcnMuICBJdCBu ZXZlciByZXR1cm5zCk5VTEwuCgpGaXhlczogOWMxNDc3ZTgzZTYyICgiZHJtL2k5MTUvc2VsZnRl c3RzOiBFeGVyY2lzZSBhZGRpbmcgcmVxdWVzdHMgdG8gYSBmdWxsIEdHVFQiKQpTaWduZWQtb2Zm LWJ5OiBEYW4gQ2FycGVudGVyIDxkYW4uY2FycGVudGVyQG9yYWNsZS5jb20+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2k5MTVfZ2VtX2V2aWN0LmMgfCAyICstCiAxIGZpbGUg Y2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvaTkxNV9nZW1fZXZpY3QuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L3NlbGZ0ZXN0cy9pOTE1X2dlbV9ldmljdC5jCmluZGV4IDlhOTQ1MTg0NmIzMy4u ODk3NjY2ODhlNDIwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMv aTkxNV9nZW1fZXZpY3QuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvaTkx NV9nZW1fZXZpY3QuYwpAQCAtNDU1LDcgKzQ1NSw3IEBAIHN0YXRpYyBpbnQgaWd0X2V2aWN0X2Nv bnRleHRzKHZvaWQgKmFyZykKIAkJCXN0cnVjdCBpOTE1X2dlbV9jb250ZXh0ICpjdHg7CiAKIAkJ CWN0eCA9IGxpdmVfY29udGV4dChpOTE1LCBmaWxlKTsKLQkJCWlmICghY3R4KQorCQkJaWYgKElT X0VSUihjdHgpKQogCQkJCWJyZWFrOwogCiAJCQkvKiBXZSB3aWxsIG5lZWQgc29tZSBHR1RUIHNw YWNlIGZvciB0aGUgcnEncyBjb250ZXh0ICovCi0tIAoyLjE3LjEKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeA==