From: Colin Ian King <colin.i.king@gmail.com>
Date: Wed, 30 Oct 2024 17:21:49 +0000 (+0000)
Subject: mtd: phram: only call platform_driver_unregister if phram_setup fails
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=78a56df609460e8e708cb4500d624dc8a3732cfa;p=users%2Fjedix%2Flinux-maple.git

mtd: phram: only call platform_driver_unregister if phram_setup fails

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>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
---

diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c
index f756c60a4931d..b8bbc7ecbe953 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;
 }