提交 22bdaf98 编写于 作者: K Kefeng Wang 提交者: Yang Yingliang

ipmi_si: fix unexpected driver unregister warning

mainline inclusion
from mainline-5.3
commit 2f663539
category: bugfix
bugzilla: NA
CVE: NA

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

If ipmi_si_platform_init()->platform_driver_register() fails,
platform_driver_unregister() called unconditionally will trigger
following warning,

ipmi_platform: Unable to register driver: -12
------------[ cut here ]------------
Unexpected driver unregister!
WARNING: CPU: 1 PID: 7210 at drivers/base/driver.c:193 driver_unregister+0x60/0x70 drivers/base/driver.c:193

Fix it by adding platform_registered variable, only unregister platform
driver when it is already successfully registered.
Reported-by: NHulk Robot <hulkci@huawei.com>
Signed-off-by: NKefeng Wang <wangkefeng.wang@huawei.com>
Message-Id: <20190517101245.4341-1-wangkefeng.wang@huawei.com>
Signed-off-by: NCorey Minyard <cminyard@mvista.com>
Signed-off-by: NWenchao Hao <haowenchao@huawei.com>
Reviewed-by: NMiaohe Lin <linmiaohe@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 fa3a3c22
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#define PFX "ipmi_platform: " #define PFX "ipmi_platform: "
static bool platform_registered;
static bool si_tryplatform = true; static bool si_tryplatform = true;
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
static bool si_tryacpi = true; static bool si_tryacpi = true;
...@@ -453,9 +454,12 @@ void ipmi_si_platform_init(void) ...@@ -453,9 +454,12 @@ void ipmi_si_platform_init(void)
int rv = platform_driver_register(&ipmi_platform_driver); int rv = platform_driver_register(&ipmi_platform_driver);
if (rv) if (rv)
pr_err(PFX "Unable to register driver: %d\n", rv); pr_err(PFX "Unable to register driver: %d\n", rv);
else
platform_registered = true;
} }
void ipmi_si_platform_shutdown(void) void ipmi_si_platform_shutdown(void)
{ {
if (platform_registered)
platform_driver_unregister(&ipmi_platform_driver); platform_driver_unregister(&ipmi_platform_driver);
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册