| From 13c96e1fbcf89abd4e73580adcb126e9f344a6a5 Mon Sep 17 00:00:00 2001 |
| From: Petr Tesarik <ptesarik@suse.com> |
| Date: Fri, 22 May 2020 20:39:22 +0200 |
| Subject: [PATCH] s390/pci: Log new handle in clp_disable_fh() |
| |
| commit e1750a3d9abbea2ece29cac8dc5a6f5bc19c1492 upstream. |
| |
| 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> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/s390/pci/pci_clp.c b/arch/s390/pci/pci_clp.c |
| index ff5a46e22839..64674b49d951 100644 |
| --- a/arch/s390/pci/pci_clp.c |
| +++ b/arch/s390/pci/pci_clp.c |
| @@ -309,14 +309,13 @@ int clp_enable_fh(struct zpci_dev *zdev, u8 nr_dma_as) |
| |
| 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; |
| } |
| |
| -- |
| 2.7.4 |
| |
