Commit 28afcb0a authored Dec 12, 2022 by Luben Tuikov Committed by Alex Deucher Dec 14, 2022

drm/amdgpu: Check if fru_addr is not NULL (v2)



Always check if fru_addr is not NULL. This commit also fixes a "smatch"
warning.

v2: Add a Fixes tag.

Cc: Alex Deucher <Alexander.Deucher@amd.com>
Cc: Dan Carpenter <error27@gmail.com>
Cc: kernel test robot <lkp@intel.com>
Cc: AMD Graphics <amd-gfx@lists.freedesktop.org>
Fixes: afbe5d1e ("drm/amdgpu: Bug-fix: Reading I2C FRU data on newer ASICs")
Signed-off-by: Luben Tuikov <luben.tuikov@amd.com>
Reviewed-by: Kent Russell <kent.russell@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent e44a0fe6

drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -64,6 +64,7 @@ static bool is_fru_eeprom_supported(struct amdgpu_device adev, u32 fru_addr)
		sizeof(atom_ctx->vbios_version)) \|\|
		strnstr(atom_ctx->vbios_version, "D163",
		sizeof(atom_ctx->vbios_version))) {
		if (fru_addr)
		*fru_addr = FRU_EEPROM_MADDR_6;
		return true;
		} else {
		@@ -83,6 +84,7 @@ static bool is_fru_eeprom_supported(struct amdgpu_device adev, u32 fru_addr)
		sizeof(atom_ctx->vbios_version))) {
		return false;
		} else {
		if (fru_addr)
		*fru_addr = FRU_EEPROM_MADDR_6;
		return true;
		}