1 files changed, 6 insertions, 21 deletions

diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
index 15ce2a3cc0f..d6ac1b261dd 100644
--- a/drivers/pci/hotplug/pciehp_ctrl.c
+++ b/drivers/pci/hotplug/pciehp_ctrl.c
@@ -142,23 +142,9 @@ u8 pciehp_handle_power_fault(struct slot *p_slot)
 
         /* power fault */
         ctrl_dbg(ctrl, "Power fault interrupt received\n");
-
-        if (!pciehp_query_power_fault(p_slot)) {
-                /*
-                 * power fault Cleared
-                 */
-                ctrl_info(ctrl, "Power fault cleared on Slot(%s)\n",
-                          slot_name(p_slot));
-                event_type = INT_POWER_FAULT_CLEAR;
-        } else {
-                /*
-                 *   power fault
-                 */
-                ctrl_info(ctrl, "Power fault on Slot(%s)\n", slot_name(p_slot));
-                event_type = INT_POWER_FAULT;
-                ctrl_info(ctrl, "Power fault bit %x set\n", 0);
-        }
-
+        ctrl_err(ctrl, "Power fault on slot %s\n", slot_name(p_slot));
+        event_type = INT_POWER_FAULT;
+        ctrl_info(ctrl, "Power fault bit %x set\n", 0);
         queue_interrupt_event(p_slot, event_type);
 
         return 1;
@@ -224,13 +210,12 @@ static int board_added(struct slot *p_slot)
         retval = pciehp_check_link_status(ctrl);
         if (retval) {
                 ctrl_err(ctrl, "Failed to check link status\n");
-                set_slot_off(ctrl, p_slot);
-                return retval;
+                goto err_exit;
         }
 
         /* Check for a power fault */
-        if (pciehp_query_power_fault(p_slot)) {
-                ctrl_dbg(ctrl, "Power fault detected\n");
+        if (ctrl->power_fault_detected || pciehp_query_power_fault(p_slot)) {
+                ctrl_err(ctrl, "Power fault on slot %s\n", slot_name(p_slot));
                 retval = -EIO;
                 goto err_exit;
         }