firmware: arm_sdei: Unregister driver on error in sdei_init()
authorGavin Shan <gshan@redhat.com>
Tue, 22 Sep 2020 13:04:15 +0000 (23:04 +1000)
committerWill Deacon <will@kernel.org>
Mon, 28 Sep 2020 20:52:22 +0000 (21:52 +0100)
The SDEI platform device is created from device-tree node or ACPI
(SDEI) table. For the later case, the platform device is created
explicitly by this module. It'd better to unregister the driver on
failure to create the device to keep the symmetry. The driver, owned
by this module, isn't needed if the device isn't existing.

Besides, the errno (@ret) should be updated accordingly in this
case.

Signed-off-by: Gavin Shan <gshan@redhat.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: James Morse <james.morse@arm.com>
Link: https://lore.kernel.org/r/20200922130423.10173-6-gshan@redhat.com
Signed-off-by: Will Deacon <will@kernel.org>
drivers/firmware/arm_sdei.c

index 1fa4e577b78eec0a45442eddda645c39164bbcb8..e7e9059c395b3e6e2c01e87538b734d11c37b8af 100644 (file)
@@ -1090,9 +1090,12 @@ static int __init sdei_init(void)
 
        pdev = platform_device_register_simple(sdei_driver.driver.name,
                                               0, NULL, 0);
-       if (IS_ERR(pdev))
-               pr_info("Failed to register ACPI:SDEI platform device %ld\n",
-                       PTR_ERR(pdev));
+       if (IS_ERR(pdev)) {
+               ret = PTR_ERR(pdev);
+               platform_driver_unregister(&sdei_driver);
+               pr_info("Failed to register ACPI:SDEI platform device %d\n",
+                       ret);
+       }
 
        return ret;
 }