Merge remote-tracking branch 'stable/linux-5.15.y' into rpi-5.15.y

[platform/kernel/linux-rpi.git] / drivers / gpu / drm / vc4 / vc4_drv.c

diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
index bd9ea20..93a2cfa 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_drv.c
+++ b/drivers/gpu/drm/vc4/vc4_drv.c
@@ -499,7 +499,12 @@ static int __init vc4_drm_register(void)
        if (ret)
                return ret;
 
-       return platform_driver_register(&vc4_platform_driver);
+       ret = platform_driver_register(&vc4_platform_driver);
+       if (ret)
+               platform_unregister_drivers(component_drivers,
+                                           ARRAY_SIZE(component_drivers));
+
+       return ret;
 }
 
 static void __exit vc4_drm_unregister(void)