1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c
index f6e378dac5f5..f40e3bd2c69c 100644
--- a/drivers/char/ipmi/ipmi_ssif.c
+++ b/drivers/char/ipmi/ipmi_ssif.c
@@ -468,11 +468,13 @@ static int ipmi_ssif_thread(void *data)
                 int result;
 
                 /* Wait for something to do */
-                wait_for_completion(&ssif_info->wake_thread);
-                init_completion(&ssif_info->wake_thread);
-
+                result = wait_for_completion_interruptible(
+                                                &ssif_info->wake_thread);
                 if (ssif_info->stopping)
                         break;
+                if (result == -ERESTARTSYS)
+                        continue;
+                init_completion(&ssif_info->wake_thread);
 
                 if (ssif_info->i2c_read_write == I2C_SMBUS_WRITE) {
                         result = i2c_smbus_write_block_data(