mtd: phram: only call platform_driver_unregister if phram_setup fails

[PATCH][next] mtd: phram: only call platform_driver_unregister if phram_setup fails

Posted by Colin Ian King 1 year, 3 months ago

The check on ret and call to platform_driver_unregister is only required
in the code path where MODULE is not defined. Fix this by moving this
code into the relevant place after the call to phram_setup.

Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
---
 drivers/mtd/devices/phram.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c
index f756c60a4931..b8bbc7ecbe95 100644
--- a/drivers/mtd/devices/phram.c
+++ b/drivers/mtd/devices/phram.c
@@ -415,14 +415,14 @@ static int __init init_phram(void)
 		return ret;
 
 #ifndef MODULE
-	if (phram_paramline[0])
+	if (phram_paramline[0]) {
 		ret = phram_setup(phram_paramline);
+		if (ret)
+			platform_driver_unregister(&phram_driver);
+	}
 	phram_init_called = 1;
 #endif
 
-	if (ret)
-		platform_driver_unregister(&phram_driver);
-
 	return ret;
 }
 
-- 
2.39.5

Re: [PATCH][next] mtd: phram: only call platform_driver_unregister if phram_setup fails

Posted by Miquel Raynal 1 year, 2 months ago

Hi,

On 30/10/2024 at 17:21:49 GMT, Colin Ian King <colin.i.king@gmail.com> wrote:

> The check on ret and call to platform_driver_unregister is only required
> in the code path where MODULE is not defined. Fix this by moving this
> code into the relevant place after the call to phram_setup.
>
> Signed-off-by: Colin Ian King <colin.i.king@gmail.com>

Applied to mtd/next.

Thanks,
Miquèl