Merge tag 'du-next-20210105' of git://linuxtv.org/pinchartl/media into drm-next

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

diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 3f57e88..d384a5b 100644 (file)
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -671,11 +671,8 @@ static int devm_drm_dev_init(struct device *parent,
        if (ret)
                return ret;
 
-       ret = devm_add_action(parent, devm_drm_dev_init_release, dev);
-       if (ret)
-               devm_drm_dev_init_release(dev);
-
-       return ret;
+       return devm_add_action_or_reset(parent,
+                                       devm_drm_dev_init_release, dev);
 }
 
 void *__devm_drm_dev_alloc(struct device *parent,
@@ -893,8 +890,6 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags)
        if (drm_core_check_feature(dev, DRIVER_MODESET))
                drm_modeset_register_all(dev);
 
-       ret = 0;
-
        DRM_INFO("Initialized %s %d.%d.%d %s for %s on minor %d\n",
                 driver->name, driver->major, driver->minor,
                 driver->patchlevel, driver->date,