raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

s390/pci: Log new handle in clp_disable_fh()

Browse Source 
[ Upstream commit e1750a3d9a ]

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: 17cdec960c ("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>
This commit is contained in:
Petr Tesarik
2020-05-22 20:39:22 +02:00
committed by Greg Kroah-Hartman
parent 862b865247
commit 241c45f390
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/s390/pci/pci_clp.c
View File

@@ -309,14 +309,13 @@ out:
int clp_disable_fh(struct zpci_dev *zdev) int clp_disable_fh(struct zpci_dev *zdev)
{ {
u32 fh = zdev->fh;
int rc; int rc;
if (!zdev_enabled(zdev)) if (!zdev_enabled(zdev))
return 0; return 0;
rc = clp_set_pci_fn(zdev, 0, CLP_SET_DISABLE_PCI_FN); 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; return rc;
} }