Skip to content

Commit 45a0faa

Browse files
Fabio Estevamlynxeye-dev
authored andcommitted
drm/etnaviv: Check for platform_device_register_simple() failure
platform_device_register_simple() may fail, so we should better check its return value and propagate it in the case of error. Cc: <[email protected]> Fixes: 246774d ("drm/etnaviv: remove the need for a gpu-subsystem DT node") Signed-off-by: Fabio Estevam <[email protected]> Reviewed-by: Philipp Zabel <[email protected]> Signed-off-by: Lucas Stach <[email protected]>
1 parent ce397d2 commit 45a0faa

File tree

1 file changed

+18
-3
lines changed

1 file changed

+18
-3
lines changed

drivers/gpu/drm/etnaviv/etnaviv_drv.c

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -631,8 +631,11 @@ static struct platform_driver etnaviv_platform_driver = {
631631
},
632632
};
633633

634+
static struct platform_device *etnaviv_drm;
635+
634636
static int __init etnaviv_init(void)
635637
{
638+
struct platform_device *pdev;
636639
int ret;
637640
struct device_node *np;
638641

@@ -644,7 +647,7 @@ static int __init etnaviv_init(void)
644647

645648
ret = platform_driver_register(&etnaviv_platform_driver);
646649
if (ret != 0)
647-
platform_driver_unregister(&etnaviv_gpu_driver);
650+
goto unregister_gpu_driver;
648651

649652
/*
650653
* If the DT contains at least one available GPU device, instantiate
@@ -653,12 +656,24 @@ static int __init etnaviv_init(void)
653656
for_each_compatible_node(np, NULL, "vivante,gc") {
654657
if (!of_device_is_available(np))
655658
continue;
656-
657-
platform_device_register_simple("etnaviv", -1, NULL, 0);
659+
pdev = platform_device_register_simple("etnaviv", -1,
660+
NULL, 0);
661+
if (IS_ERR(pdev)) {
662+
ret = PTR_ERR(pdev);
663+
of_node_put(np);
664+
goto unregister_platform_driver;
665+
}
666+
etnaviv_drm = pdev;
658667
of_node_put(np);
659668
break;
660669
}
661670

671+
return 0;
672+
673+
unregister_platform_driver:
674+
platform_driver_unregister(&etnaviv_platform_driver);
675+
unregister_gpu_driver:
676+
platform_driver_unregister(&etnaviv_gpu_driver);
662677
return ret;
663678
}
664679
module_init(etnaviv_init);

0 commit comments

Comments
 (0)