[PATCH] IPMI: fix startup race condition

[net-next-2.6.git] / drivers / char / ipmi / ipmi_msghandler.c

diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index 40eb005b9d77a5d99d2393db8b8ace41aede073f..a0b6f797d97d0f996ea85a0422f5caf6b4b3119c 100644 (file)
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -2305,8 +2305,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
                      void                     *send_info,
                      struct ipmi_device_id    *device_id,
                      struct device            *si_dev,
-                     unsigned char            slave_addr,
-                     ipmi_smi_t               *new_intf)
+                     unsigned char            slave_addr)
 {
        int              i, j;
        int              rv;
@@ -2388,9 +2387,9 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
        if (rv)
                goto out;
 
-       /* FIXME - this is an ugly kludge, this sets the intf for the
-          caller before sending any messages with it. */
-       *new_intf = intf;
+       rv = handlers->start_processing(send_info, intf);
+       if (rv)
+               goto out;
 
        get_guid(intf);