1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/pci/hotplug/s390_pci_hpc.c b/drivers/pci/hotplug/s390_pci_hpc.c
index 7db249a25016..46a7b738f61f 100644
--- a/drivers/pci/hotplug/s390_pci_hpc.c
+++ b/drivers/pci/hotplug/s390_pci_hpc.c
@@ -16,6 +16,7 @@
 #include <linux/pci.h>
 #include <linux/pci_hotplug.h>
 #include <linux/init.h>
+#include <asm/pci_debug.h>
 #include <asm/sclp.h>
 
 #define SLOT_NAME_SIZE  10
@@ -49,6 +50,7 @@ static int enable_slot(struct hotplug_slot *hotplug_slot)
                 return -EIO;
 
         rc = sclp_pci_configure(slot->zdev->fid);
+        zpci_dbg(3, "conf fid:%x, rc:%d\n", slot->zdev->fid, rc);
         if (!rc) {
                 slot->zdev->state = ZPCI_FN_STATE_CONFIGURED;
                 /* automatically scan the device after is was configured */
@@ -66,16 +68,16 @@ static int disable_slot(struct hotplug_slot *hotplug_slot)
         if (!zpci_fn_configured(slot->zdev->state))
                 return -EIO;
 
+        rc = zpci_disable_device(slot->zdev);
+        if (rc)
+                return rc;
         /* TODO: we rely on the user to unbind/remove the device, is that plausible
          *       or do we need to trigger that here?
          */
         rc = sclp_pci_deconfigure(slot->zdev->fid);
-        if (!rc) {
-                /* Fixme: better call List-PCI to find the disabled FH
-                   for the FID since the FH should be opaque... */
-                slot->zdev->fh &= 0x7fffffff;
+        zpci_dbg(3, "deconf fid:%x, rc:%d\n", slot->zdev->fid, rc);
+        if (!rc)
                 slot->zdev->state = ZPCI_FN_STATE_STANDBY;
-        }
         return rc;
 }