diff --git a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c
index 834e82987..58751c7a2 100644
--- a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c
@@ -1172,6 +1172,7 @@ err_free_ucode:
 	nvgpu_dma_free(g, &hs_bl->hs_bl_ucode);
 err_done:
 	nvgpu_release_firmware(g, hs_bl_fw);
+	acr_desc->acr_hs_bl.hs_bl_fw = NULL;
 
 	return err;
 }
@@ -1342,7 +1343,7 @@ err_free_ucode_map:
 	nvgpu_dma_unmap_free(vm, acr_ucode_mem);
 err_release_acr_fw:
 	nvgpu_release_firmware(g, acr_fw);
-	acr_fw = NULL;
+	acr_desc->acr_fw = NULL;
 	return status;
 }