1 files changed, 9 insertions, 6 deletions

diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
index 9f2d4069a5f3..8e345bfddb69 100644
--- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
+++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
@@ -68,15 +68,18 @@ static int pp_sw_init(void *handle)
                 return -EINVAL;
 
         ret = hwmgr->pptable_func->pptable_init(hwmgr);
+        if (ret)
+                goto err;
 
-        if (ret == 0)
-                ret = hwmgr->hwmgr_func->backend_init(hwmgr);
-
+        ret = hwmgr->hwmgr_func->backend_init(hwmgr);
         if (ret)
-                printk(KERN_ERR "amdgpu: powerplay initialization failed\n");
-        else
-                printk(KERN_INFO "amdgpu: powerplay initialized\n");
+                goto err;
 
+        pr_info("amdgpu: powerplay initialized\n");
+
+        return 0;
+err:
+        pr_err("amdgpu: powerplay initialization failed\n");
         return ret;
 }