diff mbox

drm/i915/selftests: fix inconsistent IS_ERR and PTR_ERR

Message ID 20180214211234.GA22341@embeddedgus (mailing list archive)
State New, archived
Headers show

Commit Message

Gustavo A. R. Silva Feb. 14, 2018, 9:12 p.m. UTC
Fix inconsistent IS_ERR and PTR_ERR in shrink_boom.
The proper pointer to use is _explode_ instead of _purge_.

This issue was detected with the help of Coccinelle.

Fixes: fe215c8bc426 ("drm/i915/selftests: add missing gtt shrinker test")
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
---
 drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Gustavo A. R. Silva Feb. 15, 2018, 4:09 p.m. UTC | #1
On 02/15/2018 03:13 AM, Jani Nikula wrote:
> On Wed, 14 Feb 2018, "Gustavo A. R. Silva" <gustavo@embeddedor.com> wrote:
>> Fix inconsistent IS_ERR and PTR_ERR in shrink_boom.
>> The proper pointer to use is _explode_ instead of _purge_.
>>
>> This issue was detected with the help of Coccinelle.
>>
>> Fixes: fe215c8bc426 ("drm/i915/selftests: add missing gtt shrinker test")
>> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
> 
> Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> 
> (Having some issues with fdo connections, thus not pushing.)
>

Thanks, Jani
--
Gustavo

>> ---
>>   drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
>> index d806427..89b6ca9 100644
>> --- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
>> +++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
>> @@ -927,7 +927,7 @@ static int shrink_boom(struct drm_i915_private *i915,
>>   
>>   		explode = fake_dma_object(i915, size);
>>   		if (IS_ERR(explode)) {
>> -			err = PTR_ERR(purge);
>> +			err = PTR_ERR(explode);
>>   			goto err_purge;
>>   		}
>
Chris Wilson Feb. 15, 2018, 4:34 p.m. UTC | #2
Quoting Gustavo A. R. Silva (2018-02-15 16:09:09)
> 
> 
> On 02/15/2018 03:13 AM, Jani Nikula wrote:
> > On Wed, 14 Feb 2018, "Gustavo A. R. Silva" <gustavo@embeddedor.com> wrote:
> >> Fix inconsistent IS_ERR and PTR_ERR in shrink_boom.
> >> The proper pointer to use is _explode_ instead of _purge_.
> >>
> >> This issue was detected with the help of Coccinelle.
> >>
> >> Fixes: fe215c8bc426 ("drm/i915/selftests: add missing gtt shrinker test")
> >> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
> > 
> > Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> > 
> > (Having some issues with fdo connections, thus not pushing.)
> >
> 
> Thanks, Jani

And pushed, thanks for the patch and review.
-Chris
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
index d806427..89b6ca9 100644
--- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
@@ -927,7 +927,7 @@  static int shrink_boom(struct drm_i915_private *i915,
 
 		explode = fake_dma_object(i915, size);
 		if (IS_ERR(explode)) {
-			err = PTR_ERR(purge);
+			err = PTR_ERR(explode);
 			goto err_purge;
 		}