[Intel-gfx] [PATCH] drm/i915/selftests: fix NULL vs IS_ERR() check in mock_context_barrier()

Dan Carpenter dan.carpenter at oracle.com
Thu Mar 21 09:22:09 UTC 2019


On Thu, Mar 21, 2019 at 10:58:40AM +0200, Mika Kuoppala wrote:
> Dan Carpenter <dan.carpenter at oracle.com> 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 <dan.carpenter at oracle.com>
> > ---
> >  .../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



More information about the Intel-gfx mailing list