Merge branch 'master' into upstream-fixes

2 files changed, 6 insertions, 4 deletions

diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
index ca2f538e549e..613d67f1c7f0 100644
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
@@ -668,6 +668,7 @@ int khvcd(void *unused)
         do {
                 poll_mask = 0;
                 hvc_kicked = 0;
+                try_to_freeze();
                 wmb();
                 if (cpus_empty(cpus_in_xmon)) {
                         spin_lock(&hvc_structs_lock);
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index f57eba0bf253..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;
         }
@@ -2481,6 +2481,7 @@ static __devinit int init_ipmi_si(void)
 #ifdef CONFIG_PCI
                 pci_unregister_driver(&ipmi_pci_driver);
 #endif
+                driver_unregister(&ipmi_driver);
                 printk("ipmi_si: Unable to find any System Interface(s)\n");
                 return -ENODEV;
         } else {