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

[Russell, Kent]

[AMD Official Use Only - General]



Reviewed-by: Kent Russell <kent.russell at amd.com>



> -----Original Message-----
> From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> On Behalf Of Luben
> Tuikov
> Sent: Monday, December 12, 2022 12:18 PM
> To: AMD Graphics <amd-gfx at lists.freedesktop.org>
> Cc: Deucher, Alexander <Alexander.Deucher at amd.com>; Tuikov, Luben
> <Luben.Tuikov at amd.com>; Dan Carpenter <error27 at gmail.com>; kernel test
> robot <lkp at intel.com>
> Subject: [PATCH] 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 at amd.com>
> Cc: Dan Carpenter <error27 at gmail.com>
> Cc: kernel test robot <lkp at intel.com>
> Cc: AMD Graphics <amd-gfx at lists.freedesktop.org>
> Fixes: afbe5d1e4bd7c7 ("drm/amdgpu: Bug-fix: Reading I2C FRU data on newer
> ASICs")
> Signed-off-by: Luben Tuikov <luben.tuikov at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c
> index 2c38ac7bc643d5..4620c4712ce32a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c
> @@ -64,7 +64,8 @@ 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))) {
> -			*fru_addr = FRU_EEPROM_MADDR_6;
> +			if (fru_addr)
> +				*fru_addr = FRU_EEPROM_MADDR_6;
>  			return true;
>  		} else {
>  			return false;
> @@ -83,7 +84,8 @@ static bool is_fru_eeprom_supported(struct
> amdgpu_device *adev, u32 *fru_addr)
>  				    sizeof(atom_ctx->vbios_version))) {
>  				return false;
>  			} else {
> -				*fru_addr = FRU_EEPROM_MADDR_6;
> +				if (fru_addr)
> +					*fru_addr = FRU_EEPROM_MADDR_6;
>  				return true;
>  			}
>  		} else {
> 
> base-commit: 20e03e7f6e8efd42168db6d3fe044b804e0ede8f
> --
> 2.39.0.rc2