drm/radeon/r600: Fix variables that are not used after assignment

Tian Tao · alexdeucher · commit ccfc4392f257 · 2021-04-09T16:55:08.000-04:00
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 &lt;tiantao6@hisilicon.com&gt;
Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt;
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
@@ -2569,6 +2569,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);
@@ -2579,6 +2580,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)) {

Original file line number	Diff line number	Diff line change
`@@ -2569,6 +2569,7 @@ int r600_init_microcode(struct radeon_device *rdev)`
`2569`	`2569`	`pr_err("r600_cp: Bogus length %zu in firmware \"%s\"\n",`
`2570`	`2570`	`rdev->me_fw->size, fw_name);`
`2571`	`2571`	`err = -EINVAL;`
	`2572`	`+ goto out;`
`2572`	`2573`	`}`
`2573`	`2574`
`2574`	`2575`	`snprintf(fw_name, sizeof(fw_name), "radeon/%s_rlc.bin", rlc_chip_name);`
`@@ -2579,6 +2580,7 @@ int r600_init_microcode(struct radeon_device *rdev)`
`2579`	`2580`	`pr_err("r600_rlc: Bogus length %zu in firmware \"%s\"\n",`
`2580`	`2581`	`rdev->rlc_fw->size, fw_name);`
`2581`	`2582`	`err = -EINVAL;`
	`2583`	`+ goto out;`
`2582`	`2584`	`}`
`2583`	`2585`
`2584`	`2586`	`if ((rdev->family >= CHIP_RV770) && (rdev->family <= CHIP_HEMLOCK)) {`