[PATCH] IPMI: fix handling of OEM flags

If one of the OEM flags becomes set in the flags from the hardware, the
driver could hang if no OEM handler was set.  Fix the code to handle this.
This was tested by setting the flags by hand after they were fetched.

Signed-off-by: Corey Minyard <minyard@acm.org>
Ackde-by: Matt Domsch <Matt_Domsch@dell.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 31b59403b632..abca98beac14 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -402,10 +402,10 @@ static void handle_flags(struct smi_info *smi_info)
                         smi_info->curr_msg->data,
                         smi_info->curr_msg->data_size);
                 smi_info->si_state = SI_GETTING_EVENTS;
-        } else if (smi_info->msg_flags & OEM_DATA_AVAIL) {
-                if (smi_info->oem_data_avail_handler)
-                        if (smi_info->oem_data_avail_handler(smi_info))
-                                goto retry;
+        } else if (smi_info->msg_flags & OEM_DATA_AVAIL &&
+                   smi_info->oem_data_avail_handler) {
+                if (smi_info->oem_data_avail_handler(smi_info))
+                        goto retry;
         } else {
                 smi_info->si_state = SI_NORMAL;
         }