err was not used after being assigned -EINVAL and was given a new value, so here add goto to handle the error case.
Signed-off-by: Tian Tao tiantao6@hisilicon.com --- drivers/gpu/drm/radeon/r600.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index b44e0c6..d516ad7 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -2570,6 +2570,7 @@ int r600_init_microcode(struct radeon_device *rdev) pr_err("r600_cp: Bogus length %zu in firmware "%s"\n", rdev->me_fw->size, fw_name); err = -EINVAL; + goto out; }
snprintf(fw_name, sizeof(fw_name), "radeon/%s_rlc.bin", rlc_chip_name); @@ -2580,6 +2581,7 @@ int r600_init_microcode(struct radeon_device *rdev) pr_err("r600_rlc: Bogus length %zu in firmware "%s"\n", rdev->rlc_fw->size, fw_name); err = -EINVAL; + goto out; }
if ((rdev->family >= CHIP_RV770) && (rdev->family <= CHIP_HEMLOCK)) {
Applied. Thanks!
Alex
On Thu, Apr 8, 2021 at 8:13 AM Tian Tao tiantao6@hisilicon.com wrote:
err was not used after being assigned -EINVAL and was given a new value, so here add goto to handle the error case.
Signed-off-by: Tian Tao tiantao6@hisilicon.com
drivers/gpu/drm/radeon/r600.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index b44e0c6..d516ad7 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -2570,6 +2570,7 @@ int r600_init_microcode(struct radeon_device *rdev) pr_err("r600_cp: Bogus length %zu in firmware "%s"\n", rdev->me_fw->size, fw_name); err = -EINVAL;
goto out; } snprintf(fw_name, sizeof(fw_name), "radeon/%s_rlc.bin", rlc_chip_name);@@ -2580,6 +2581,7 @@ int r600_init_microcode(struct radeon_device *rdev) pr_err("r600_rlc: Bogus length %zu in firmware "%s"\n", rdev->rlc_fw->size, fw_name); err = -EINVAL;
goto out; } if ((rdev->family >= CHIP_RV770) && (rdev->family <= CHIP_HEMLOCK)) {-- 2.7.4
dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
dri-devel@lists.freedesktop.org
-
Alex Deucher -
Tian Tao