From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Thu, 21 Mar 2019 09:22:09 +0000 Subject: Re: [PATCH] drm/i915/selftests: fix NULL vs IS_ERR() check in mock_context_barrier() Message-Id: <20190321092209.GJ2202@kadam> List-Id: References: <20190321083335.GA31210@kadam> <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: Mika Kuoppala Cc: David Airlie , intel-gfx@lists.freedesktop.org, kernel-janitors@vger.kernel.org, Matthew Auld On Thu, Mar 21, 2019 at 10:58:40AM +0200, Mika Kuoppala wrote: > Dan Carpenter writes: > > > 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 > > --- > > .../gpu/drm/i915/selftests/i915_gem_context.c | 4 +- > > drivers/staging/erofs/unzip_vle.c | 70 ++++++++++--------- > > 2 files changed, 38 insertions(+), 36 deletions(-) > > > > 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; > > } > > Yup. > > The rest of the diff is unrelated tho, please resend. > Oh, crap. Sorry! It was below the bottom of my page in my email client so I didn't see it. regards, dan carpenter From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: Re: [PATCH] drm/i915/selftests: fix NULL vs IS_ERR() check in mock_context_barrier() Date: Thu, 21 Mar 2019 12:22:09 +0300 Message-ID: <20190321092209.GJ2202@kadam> References: <20190321083335.GA31210@kadam> <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 aserp2130.oracle.com (aserp2130.oracle.com [141.146.126.79]) by gabe.freedesktop.org (Postfix) with ESMTPS id B31E589F35 for ; Thu, 21 Mar 2019 09:22:30 +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: Mika Kuoppala Cc: David Airlie , intel-gfx@lists.freedesktop.org, kernel-janitors@vger.kernel.org, Matthew Auld List-Id: intel-gfx@lists.freedesktop.org T24gVGh1LCBNYXIgMjEsIDIwMTkgYXQgMTA6NTg6NDBBTSArMDIwMCwgTWlrYSBLdW9wcGFsYSB3 cm90ZToKPiBEYW4gQ2FycGVudGVyIDxkYW4uY2FycGVudGVyQG9yYWNsZS5jb20+IHdyaXRlczoK PiAKPiA+IFRoZSBtb2NrX2NvbnRleHQoKSBmdW5jdGlvbiByZXR1cm5zIE5VTEwgb24gZXJyb3Is IGl0IGRvZXNuJ3QgcmV0dXJuCj4gPiBlcnJvciBwb2ludGVycy4KPiA+Cj4gPiBGaXhlczogODVm ZGRmMGIwMDI3ICgiZHJtL2k5MTU6IEludHJvZHVjZSBhIGNvbnRleHQgYmFycmllciBjYWxsYmFj ayIpCj4gPiBTaWduZWQtb2ZmLWJ5OiBEYW4gQ2FycGVudGVyIDxkYW4uY2FycGVudGVyQG9yYWNs ZS5jb20+Cj4gPiAtLS0KPiA+ICAuLi4vZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9pOTE1X2dlbV9j b250ZXh0LmMgfCAgNCArLQo+ID4gIGRyaXZlcnMvc3RhZ2luZy9lcm9mcy91bnppcF92bGUuYyAg ICAgICAgICAgICB8IDcwICsrKysrKysrKystLS0tLS0tLS0KPiA+ICAyIGZpbGVzIGNoYW5nZWQs IDM4IGluc2VydGlvbnMoKyksIDM2IGRlbGV0aW9ucygtKQo+ID4KPiA+IGRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvaTkxNV9nZW1fY29udGV4dC5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2k5MTVfZ2VtX2NvbnRleHQuYwo+ID4gaW5kZXggNDM5 OWVmOWViZjE1Li5hMTcyZGJkOWNiOWUgMTAwNjQ0Cj4gPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9zZWxmdGVzdHMvaTkxNV9nZW1fY29udGV4dC5jCj4gPiArKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9zZWxmdGVzdHMvaTkxNV9nZW1fY29udGV4dC5jCj4gPiBAQCAtMTYyMCw4ICsxNjIw LDggQEAgc3RhdGljIGludCBtb2NrX2NvbnRleHRfYmFycmllcih2b2lkICphcmcpCj4gPiAgCW11 dGV4X2xvY2soJmk5MTUtPmRybS5zdHJ1Y3RfbXV0ZXgpOwo+ID4gIAo+ID4gIAljdHggPSBtb2Nr X2NvbnRleHQoaTkxNSwgIm1vY2siKTsKPiA+IC0JaWYgKElTX0VSUihjdHgpKSB7Cj4gPiAtCQll cnIgPSBQVFJfRVJSKGN0eCk7Cj4gPiArCWlmICghY3R4KSB7Cj4gPiArCQllcnIgPSAtRU5PTUVN Owo+ID4gIAkJZ290byB1bmxvY2s7Cj4gPiAgCX0KPiAKPiBZdXAuCj4gCj4gVGhlIHJlc3Qgb2Yg dGhlIGRpZmYgaXMgdW5yZWxhdGVkIHRobywgcGxlYXNlIHJlc2VuZC4KPiAKCk9oLCBjcmFwLiAg U29ycnkhICBJdCB3YXMgYmVsb3cgdGhlIGJvdHRvbSBvZiBteSBwYWdlIGluIG15IGVtYWlsIGNs aWVudApzbyBJIGRpZG4ndCBzZWUgaXQuCgpyZWdhcmRzLApkYW4gY2FycGVudGVyCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZng=