From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 113BC1F6698; Wed, 6 Nov 2024 12:59:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730897962; cv=none; b=q0lCuTAqr31SdhQ7tlXGkTrRRpxvsvVUs28H93falJmg30U+AJRxjNB24bPa8ymxT+66DRykfo38FD5GChvm6YuVTOZCWYhmIrc93Je6jwIzD6NcHV36HFa61oibe6NFSerqT+S35oHxBKeOCurUADtMXDP3DywNDsRsOG2n0jU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730897962; c=relaxed/simple; bh=gbx3e5U4w7mzydddGFZUw21YhSoylCZxg2FTOgPfoWY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hqIxDhMVOMCg3w8WAhS2tOs5s1HepoQddR1tT5gW5W8C/Ovkk0BWIGN8/INQrljJ/5BtxOW8Qke/Cf5aMcEZpN6r3PUO7cpbc+yvobrxPamt7gyh4krB569LwzhZT/u7WGiyw9+S1xjscHYlvhOUPsAQwBvU07R1QnUlGynlKuk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=UlcDUZ8v; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="UlcDUZ8v" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4DCBEC4CECD; Wed, 6 Nov 2024 12:59:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1730897961; bh=gbx3e5U4w7mzydddGFZUw21YhSoylCZxg2FTOgPfoWY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UlcDUZ8vpa/OGM4hh3HXfE0TKX7C4Bw+9ZwG07HHtZxWfHvPzmSmk8EZpmywxcvgG mhbaJyFWSHW5YLLSRcy5Jmr2z2+FcISydm90toCgnlOCsGFHDR3BChdsbertDz/aIS whfRvmI0WGpR1ZngOweRISstL5Zgj7/bQDIQxtuY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Aleksandr Mishin , Dmitry Baryshkov , Rob Clark , Sasha Levin Subject: [PATCH 5.4 078/462] drm/msm: Fix incorrect file name output in adreno_request_fw() Date: Wed, 6 Nov 2024 12:59:31 +0100 Message-ID: <20241106120333.434437568@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241106120331.497003148@linuxfoundation.org> References: <20241106120331.497003148@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Aleksandr Mishin [ Upstream commit e19366911340c2313a1abbb09c54eaf9bdea4f58 ] In adreno_request_fw() when debugging information is printed to the log after firmware load, an incorrect filename is printed. 'newname' is used instead of 'fwname', so prefix "qcom/" is being added to filename. Looks like "copy-paste" mistake. Fix this mistake by replacing 'newname' with 'fwname'. Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: 2c41ef1b6f7d ("drm/msm/adreno: deal with linux-firmware fw paths") Signed-off-by: Aleksandr Mishin Reviewed-by: Dmitry Baryshkov Patchwork: https://patchwork.freedesktop.org/patch/602382/ Signed-off-by: Rob Clark Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index 6f83253a8c585..3edecd4fc8f60 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -247,7 +247,7 @@ adreno_request_fw(struct adreno_gpu *adreno_gpu, const char *fwname) ret = request_firmware_direct(&fw, fwname, drm->dev); if (!ret) { DRM_DEV_INFO(drm->dev, "loaded %s from legacy location\n", - newname); + fwname); adreno_gpu->fwloc = FW_LOCATION_LEGACY; goto out; } else if (adreno_gpu->fwloc != FW_LOCATION_UNKNOWN) { -- 2.43.0