summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorCorey Minyard2019-04-24 17:11:16 +0200
committerCorey Minyard2019-04-24 19:29:24 +0200
commit44f56a39addecd6e93b8aa6fa51a6255259edbbb (patch)
treebabae5922bd6c63c781149cee8041d585a0e5e1f /drivers/char
parentipmi:ssif: compare block number correctly for multi-part return messages (diff)
downloadkernel-qcow2-linux-44f56a39addecd6e93b8aa6fa51a6255259edbbb.tar.gz
kernel-qcow2-linux-44f56a39addecd6e93b8aa6fa51a6255259edbbb.tar.xz
kernel-qcow2-linux-44f56a39addecd6e93b8aa6fa51a6255259edbbb.zip
ipmi:ssif: Only unregister the platform driver if it was registered
Otherwise you will get an error when the driver is removed if you set trydmi=0. Signed-off-by: Corey Minyard <cminyard@mvista.com>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/ipmi/ipmi_ssif.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c
index aaccb0ff1ea6..be329f791c95 100644
--- a/drivers/char/ipmi/ipmi_ssif.c
+++ b/drivers/char/ipmi/ipmi_ssif.c
@@ -2111,7 +2111,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();
}