Merge tag 'exfat-for-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linki...

[linux-2.6-microblaze.git] / drivers / gpu / drm / radeon / cik.c

diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
index 42a8afa..81b4de7 100644 (file)
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -7439,7 +7439,7 @@ static void cik_irq_disable(struct radeon_device *rdev)
 }
 
 /**
- * cik_irq_disable - disable interrupts for suspend
+ * cik_irq_suspend - disable interrupts for suspend
  *
  * @rdev: radeon_device pointer
  *
@@ -8584,9 +8584,7 @@ int cik_init(struct radeon_device *rdev)
        radeon_get_clock_info(rdev->ddev);
 
        /* Fence driver */
-       r = radeon_fence_driver_init(rdev);
-       if (r)
-               return r;
+       radeon_fence_driver_init(rdev);
 
        /* initialize memory controller */
        r = cik_mc_init(rdev);