projects
/
wrapfs-5.6.y.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8fb90fe
)
s390/pci: Log new handle in clp_disable_fh()
author
Petr Tesarik
<ptesarik@suse.com>
Fri, 22 May 2020 18:39:22 +0000
(20:39 +0200)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 17 Jun 2020 14:41:52 +0000
(16:41 +0200)
[ Upstream commit
e1750a3d9abbea2ece29cac8dc5a6f5bc19c1492
]
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: Sasha Levin <sashal@kernel.org>
arch/s390/pci/pci_clp.c
patch
|
blob
|
history
diff --git
a/arch/s390/pci/pci_clp.c
b/arch/s390/pci/pci_clp.c
index 0d3d8f170ea4297fc897b1b4472fc6e79f01e80a..25208fa95426043ff388841320d7aeaebf3be56b 100644
(file)
--- 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;
}