From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Tue, 16 Nov 2021 11:49:16 +0000 (+0300)
Subject: drm/i915/guc: fix NULL vs IS_ERR() checking
X-Git-Tag: baikal/aarch64/sdk6.1~5247^2~1^2
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=c977d20f3e0828ec364e7e36d5ac47f2657a67c8;p=kernel.git

drm/i915/guc: fix NULL vs IS_ERR() checking

The intel_engine_create_virtual() function does not return NULL.  It
returns error pointers.

Fixes: 156441007d97 ("drm/i915/guc: Connect UAPI to GuC multi-lrc interface")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211116114916.GB11936@kili
(cherry picked from commit fc12b70d12d07598cde27cc17dbfafc2a2a33ff8)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
index 38b47e73e35db..c48557dfa04c4 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
@@ -3080,8 +3080,8 @@ guc_create_parallel(struct intel_engine_cs **engines,
 
 		ce = intel_engine_create_virtual(siblings, num_siblings,
 						 FORCE_VIRTUAL);
-		if (!ce) {
-			err = ERR_PTR(-ENOMEM);
+		if (IS_ERR(ce)) {
+			err = ERR_CAST(ce);
 			goto unwind;
 		}