From: Zhanjun Dong <zhanjun.dong@intel.com>
Date: Mon, 21 Jul 2025 21:45:20 +0000 (-0400)
Subject: drm/xe/uc: Fix missing unwind goto
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc94168eaa6f6f2476c4e1a894bd8d031df6226d;p=thirdparty%2Flinux.git

drm/xe/uc: Fix missing unwind goto

Fix missing unwind goto on error handling.

Fixes: b2c4ac219fa4 ("drm/xe/uc: Disable GuC communication on hardware initialization error")
Signed-off-by: Zhanjun Dong <zhanjun.dong@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Link: https://lore.kernel.org/r/20250721214520.954014-1-zhanjun.dong@intel.com
(cherry picked from commit 176f44a5ec0b074aaf44852db77d0c183c36696d)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---

diff --git a/drivers/gpu/drm/xe/xe_uc.c b/drivers/gpu/drm/xe/xe_uc.c
index 3e0c3af235f27..465bda3554439 100644
--- a/drivers/gpu/drm/xe/xe_uc.c
+++ b/drivers/gpu/drm/xe/xe_uc.c
@@ -164,7 +164,7 @@ static int vf_uc_load_hw(struct xe_uc *uc)
 
 	err = xe_guc_opt_in_features_enable(&uc->guc);
 	if (err)
-		return err;
+		goto err_out;
 
 	err = xe_gt_record_default_lrcs(uc_to_gt(uc));
 	if (err)