From fa3a3c222f9f20ee9dcdbe1ece7db690d548a326 Mon Sep 17 00:00:00 2001
From: Corey Minyard <cminyard@mvista.com>
Date: Tue, 20 Apr 2021 19:46:38 +0800
Subject: [PATCH] ipmi:ssif: Only unregister the platform driver if it was
 registered

mainline inclusion
from mainline-5.2
commit 44f56a39addecd6e93b8aa6fa51a6255259edbbb
category: bugfix
bugzilla: NA
CVE: NA

-------------------------------------------------

Otherwise you will get an error when the driver is removed if you
set trydmi=0.

Signed-off-by: Corey Minyard <cminyard@mvista.com>
Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
Reviewed-by: Miaohe Lin <linmiaohe@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/char/ipmi/ipmi_ssif.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c
index c91841843388..4f31d1cf546c 100644
--- a/drivers/char/ipmi/ipmi_ssif.c
+++ b/drivers/char/ipmi/ipmi_ssif.c
@@ -1972,7 +1972,8 @@ static void cleanup_ipmi_ssif(void)
 
 	kfree(ssif_i2c_driver.address_list);
 
-	platform_driver_unregister(&ipmi_driver);
+	if (ssif_trydmi)
+		platform_driver_unregister(&ipmi_driver);
 
 	free_ssif_clients();
 }
-- 
GitLab