From: Sagar Arun Kamble Date: Wed, 31 Jan 2018 06:14:37 +0000 (+0530) Subject: drm/i915/guc: Fix return from guc_log_relay_file_create X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=b1852d362f31ac0c233e7c7b040f7c58bd381267;p=openwrt%2Fstaging%2Fblogic.git drm/i915/guc: Fix return from guc_log_relay_file_create guc_log_relay_file_create will return -EEXIST if we invoke relay_late_setup_files multiple times as part of i915_guc_log_control. However this is to be not cosidered as fail and need to return 0. This was mistakenly introduced in the below commit. Fix it. Fixes: 70deeaddc6e6 "drm/i915/guc: Fix lockdep due to log relay channel handling under struct_mutex" Signed-off-by: Sagar Arun Kamble Cc: Chris Wilson Cc: Michal Wajdeczko Link: https://patchwork.freedesktop.org/patch/msgid/1517379279-12967-1-git-send-email-sagar.a.kamble@intel.com Reviewed-by: Chris Wilson Signed-off-by: Chris Wilson --- diff --git a/drivers/gpu/drm/i915/intel_guc_log.c b/drivers/gpu/drm/i915/intel_guc_log.c index 86a33214cbfc..3fbe93ac81dc 100644 --- a/drivers/gpu/drm/i915/intel_guc_log.c +++ b/drivers/gpu/drm/i915/intel_guc_log.c @@ -185,6 +185,8 @@ static int guc_log_relay_file_create(struct intel_guc *guc) goto out_unlock; } + ret = 0; + out_unlock: mutex_unlock(&guc->log.runtime.relay_lock); return ret;