s390/pci: Log new handle in clp_disable_fh()
authorPetr Tesarik <ptesarik@suse.com>
Fri, 22 May 2020 18:39:22 +0000 (20:39 +0200)
committerVasily Gorbik <gor@linux.ibm.com>
Thu, 28 May 2020 10:26:03 +0000 (12:26 +0200)
After disabling a function, the original handle is logged instead of
the disabled handle.

Link: https://lkml.kernel.org/r/20200522183922.5253-1-ptesarik@suse.com
Fixes: 17cdec960cf7 ("s390/pci: Recover handle in clp_set_pci_fn()")
Reviewed-by: Pierre Morel <pmorel@linux.ibm.com>
Signed-off-by: Petr Tesarik <ptesarik@suse.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
arch/s390/pci/pci_clp.c

index d7bd3c287cf7eb4342b9ff0b648f77987ae14f23..7e735f41a0a643b5ae15725fde93b27a47854b5c 100644 (file)
@@ -314,14 +314,13 @@ out:
 
 int clp_disable_fh(struct zpci_dev *zdev)
 {
-       u32 fh = zdev->fh;
        int rc;
 
        if (!zdev_enabled(zdev))
                return 0;
 
        rc = clp_set_pci_fn(zdev, 0, CLP_SET_DISABLE_PCI_FN);
-       zpci_dbg(3, "dis fid:%x, fh:%x, rc:%d\n", zdev->fid, fh, rc);
+       zpci_dbg(3, "dis fid:%x, fh:%x, rc:%d\n", zdev->fid, zdev->fh, rc);
        return rc;
 }