2021-10-22 12:10:28

by Harris Song

Subject: [PATCH] drm/i915/selftests: Fix inconsistent IS_ERR and PTR_ERR

Fix inconsistent IS_ERR and PTR_ERR in i915_gem_dmabuf.c

Signed-off-by: Kai Song <[email protected]>
---
drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
index 4a6bb64c3a35..3cc74b0fed06 100644
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
@@ -102,7 +102,7 @@ static int igt_dmabuf_import_same_driver_lmem(void *arg)
obj = __i915_gem_object_create_user(i915, PAGE_SIZE, &lmem, 1);
if (IS_ERR(obj)) {
pr_err("__i915_gem_object_create_user failed with err=%ld\n",
- PTR_ERR(dmabuf));
+ PTR_ERR(obj));
err = PTR_ERR(obj);
goto out_ret;
}
@@ -158,7 +158,7 @@ static int igt_dmabuf_import_same_driver(struct drm_i915_private *i915,
regions, num_regions);
if (IS_ERR(obj)) {
pr_err("__i915_gem_object_create_user failed with err=%ld\n",
- PTR_ERR(dmabuf));
+ PTR_ERR(obj));
err = PTR_ERR(obj);
goto out_ret;
}
--
2.27.0

2021-10-25 11:14:47

by Matthew Auld

Subject: Re: [PATCH] drm/i915/selftests: Fix inconsistent IS_ERR and PTR_ERR

On 22/10/2021 13:06, Kai Song wrote:
> Fix inconsistent IS_ERR and PTR_ERR in i915_gem_dmabuf.c
>
> Signed-off-by: Kai Song <[email protected]>

Pushed to drm-intel-gt-next. Thanks.

> ---
> drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
> index 4a6bb64c3a35..3cc74b0fed06 100644
> --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
> +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
> @@ -102,7 +102,7 @@ static int igt_dmabuf_import_same_driver_lmem(void *arg)
> obj = __i915_gem_object_create_user(i915, PAGE_SIZE, &lmem, 1);
> if (IS_ERR(obj)) {
> pr_err("__i915_gem_object_create_user failed with err=%ld\n",
> - PTR_ERR(dmabuf));
> + PTR_ERR(obj));
> err = PTR_ERR(obj);
> goto out_ret;
> }
> @@ -158,7 +158,7 @@ static int igt_dmabuf_import_same_driver(struct drm_i915_private *i915,
> regions, num_regions);
> if (IS_ERR(obj)) {
> pr_err("__i915_gem_object_create_user failed with err=%ld\n",
> - PTR_ERR(dmabuf));
> + PTR_ERR(obj));
> err = PTR_ERR(obj);
> goto out_ret;
> }
>