Merge tag 'for-linus-6.1-1' of https://github.com/cminyard/linux-ipmi

[linux-2.6-block.git] / drivers / char / ipmi / ipmi_ipmb.c

diff --git a/drivers/char/ipmi/ipmi_ipmb.c b/drivers/char/ipmi/ipmi_ipmb.c
index 25c010c9ec256ef3d7443fb510aca75ba3bdfec0..7c1aee5e11b7739f110f40056b39ae42d23df339 100644 (file)
--- a/drivers/char/ipmi/ipmi_ipmb.c
+++ b/drivers/char/ipmi/ipmi_ipmb.c
@@ -218,8 +218,8 @@ static void ipmi_ipmb_send_response(struct ipmi_ipmb_dev *iidev,
 {
        if ((msg->data[0] >> 2) & 1) {
                /*
-                * It's a response being sent, we needto return a
-                * response response.  Fake a send msg command
+                * It's a response being sent, we need to return a
+                * response to the response.  Fake a send msg command
                 * response with channel 0.  This will always be ipmb
                 * direct.
                 */
@@ -424,10 +424,8 @@ static void ipmi_ipmb_request_events(void *send_info)
        /* We don't fetch events here. */
 }
 
-static void ipmi_ipmb_remove(struct i2c_client *client)
+static void ipmi_ipmb_cleanup(struct ipmi_ipmb_dev *iidev)
 {
-       struct ipmi_ipmb_dev *iidev = i2c_get_clientdata(client);
-
        if (iidev->slave) {
                i2c_slave_unregister(iidev->slave);
                if (iidev->slave != iidev->client)
@@ -436,7 +434,13 @@ static void ipmi_ipmb_remove(struct i2c_client *client)
        iidev->slave = NULL;
        iidev->client = NULL;
        ipmi_ipmb_stop_thread(iidev);
+}
+
+static void ipmi_ipmb_remove(struct i2c_client *client)
+{
+       struct ipmi_ipmb_dev *iidev = i2c_get_clientdata(client);
 
+       ipmi_ipmb_cleanup(iidev);
        ipmi_unregister_smi(iidev->intf);
 }
 
@@ -542,7 +546,7 @@ static int ipmi_ipmb_probe(struct i2c_client *client)
 out_err:
        if (slave && slave != client)
                i2c_unregister_device(slave);
-       ipmi_ipmb_remove(client);
+       ipmi_ipmb_cleanup(iidev);
        return rv;
 }