summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorNaveen Naidu <naveennaidu479@gmail.com>2021-11-18 19:33:21 +0530
committerBjorn Helgaas <bhelgaas@google.com>2021-11-18 13:40:50 -0600
commit5a50b8b1ea88d75f7088df468ce05778c13f9eb7 (patch)
tree642f88e2bf15c0f4645885699a1d3304a09f27f8 /drivers/pci
parent7dcd026fb70fe30308c8be8997799ca92a238e11 (diff)
downloadlinux-stable-5a50b8b1ea88d75f7088df468ce05778c13f9eb7.tar.gz
linux-stable-5a50b8b1ea88d75f7088df468ce05778c13f9eb7.tar.bz2
linux-stable-5a50b8b1ea88d75f7088df468ce05778c13f9eb7.zip
PCI: aardvark: Drop error data fabrication when config read fails
If config pci_ops.read() methods return failure, the PCI_OP_READ() and PCI_USER_READ_CONFIG() wrappers use PCI_SET_ERROR_RESPONSE() to set the data value, so there's no need to set it in the pci_ops.read() methods themselves. Drop the unnecessary data value fabrication when pci_ops.read() fails. Link: https://lore.kernel.org/r/335014f2b44cdf24ed1e37cb7c88f6c5de896cc2.1637243717.git.naveennaidu479@gmail.com Signed-off-by: Naveen Naidu <naveennaidu479@gmail.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Pali Rohár <pali@kernel.org>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/controller/pci-aardvark.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
index c5300d49807a..1de41d2c9b44 100644
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@ -1026,10 +1026,8 @@ static int advk_pcie_rd_conf(struct pci_bus *bus, u32 devfn,
u32 reg;
int ret;
- if (!advk_pcie_valid_device(pcie, bus, devfn)) {
- *val = 0xffffffff;
+ if (!advk_pcie_valid_device(pcie, bus, devfn))
return PCIBIOS_DEVICE_NOT_FOUND;
- }
if (pci_is_root_bus(bus))
return pci_bridge_emul_conf_read(&pcie->bridge, where,