From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Thu, 21 Mar 2019 09:24:51 +0000 Subject: [PATCH v2] drm/i915/selftests: fix NULL vs IS_ERR() check in mock_context_barrier() Message-Id: <20190321092451.GK2202@kadam> List-Id: References: <8736ng1u4f.fsf@gaia.fi.intel.com> In-Reply-To: <8736ng1u4f.fsf@gaia.fi.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Jani Nikula , Chris Wilson Cc: David Airlie , intel-gfx@lists.freedesktop.org, kernel-janitors@vger.kernel.org, Matthew Auld The mock_context() function returns NULL on error, it doesn't return error pointers. Fixes: 85fddf0b0027 ("drm/i915: Introduce a context barrier callback") Signed-off-by: Dan Carpenter --- V2: I accidentally sent a bunch of unrelated stuff... diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_context.c b/drivers/gpu/drm/i915/selftests/i915_gem_context.c index 4399ef9ebf15..a172dbd9cb9e 100644 --- a/drivers/gpu/drm/i915/selftests/i915_gem_context.c +++ b/drivers/gpu/drm/i915/selftests/i915_gem_context.c @@ -1620,8 +1620,8 @@ static int mock_context_barrier(void *arg) mutex_lock(&i915->drm.struct_mutex); ctx = mock_context(i915, "mock"); - if (IS_ERR(ctx)) { - err = PTR_ERR(ctx); + if (!ctx) { + err = -ENOMEM; goto unlock; } From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [PATCH v2] drm/i915/selftests: fix NULL vs IS_ERR() check in mock_context_barrier() Date: Thu, 21 Mar 2019 12:24:51 +0300 Message-ID: <20190321092451.GK2202@kadam> References: <8736ng1u4f.fsf@gaia.fi.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from userp2120.oracle.com (userp2120.oracle.com [156.151.31.85]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2778389F92 for ; Thu, 21 Mar 2019 09:25:08 +0000 (UTC) Content-Disposition: inline In-Reply-To: <8736ng1u4f.fsf@gaia.fi.intel.com> 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: David Airlie , intel-gfx@lists.freedesktop.org, kernel-janitors@vger.kernel.org, Matthew Auld List-Id: intel-gfx@lists.freedesktop.org VGhlIG1vY2tfY29udGV4dCgpIGZ1bmN0aW9uIHJldHVybnMgTlVMTCBvbiBlcnJvciwgaXQgZG9l c24ndCByZXR1cm4KZXJyb3IgcG9pbnRlcnMuCgpGaXhlczogODVmZGRmMGIwMDI3ICgiZHJtL2k5 MTU6IEludHJvZHVjZSBhIGNvbnRleHQgYmFycmllciBjYWxsYmFjayIpClNpZ25lZC1vZmYtYnk6 IERhbiBDYXJwZW50ZXIgPGRhbi5jYXJwZW50ZXJAb3JhY2xlLmNvbT4KLS0tClYyOiBJIGFjY2lk ZW50YWxseSBzZW50IGEgYnVuY2ggb2YgdW5yZWxhdGVkIHN0dWZmLi4uCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2k5MTVfZ2VtX2NvbnRleHQuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9pOTE1X2dlbV9jb250ZXh0LmMKaW5kZXggNDM5OWVm OWViZjE1Li5hMTcyZGJkOWNiOWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3Nl bGZ0ZXN0cy9pOTE1X2dlbV9jb250ZXh0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2Vs ZnRlc3RzL2k5MTVfZ2VtX2NvbnRleHQuYwpAQCAtMTYyMCw4ICsxNjIwLDggQEAgc3RhdGljIGlu dCBtb2NrX2NvbnRleHRfYmFycmllcih2b2lkICphcmcpCiAJbXV0ZXhfbG9jaygmaTkxNS0+ZHJt LnN0cnVjdF9tdXRleCk7CiAKIAljdHggPSBtb2NrX2NvbnRleHQoaTkxNSwgIm1vY2siKTsKLQlp ZiAoSVNfRVJSKGN0eCkpIHsKLQkJZXJyID0gUFRSX0VSUihjdHgpOworCWlmICghY3R4KSB7CisJ CWVyciA9IC1FTk9NRU07CiAJCWdvdG8gdW5sb2NrOwogCX0KIApfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZng=