Merge drm/drm-next into drm-misc-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / panfrost / panfrost_drv.c

diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c
index 7a628e89d379a5fc3f71b131284b1afe9ccbbcb8..a926d71e813137fd4320f4dd397a739df0bf0000 100644 (file)
--- a/drivers/gpu/drm/panfrost/panfrost_drv.c
+++ b/drivers/gpu/drm/panfrost/panfrost_drv.c
@@ -659,10 +659,14 @@ static int panfrost_probe(struct platform_device *pdev)
        if (err < 0)
                goto err_out1;
 
-       panfrost_gem_shrinker_init(ddev);
+       err = panfrost_gem_shrinker_init(ddev);
+       if (err)
+               goto err_out2;
 
        return 0;
 
+err_out2:
+       drm_dev_unregister(ddev);
 err_out1:
        pm_runtime_disable(pfdev->dev);
        panfrost_device_fini(pfdev);