From: Pali Rohár Date: Mon, 1 Jun 2020 13:03:15 +0000 (+0200) Subject: PCI: aardvark: Indicate error in 'val' when config read fails X-Git-Tag: rel_imx_5.10.35_2.0.0-somdevices.0~1480^2~12^2~1 X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=b1bd5714472cc72e14409f5659b154c765a76c65;p=linux.git PCI: aardvark: Indicate error in 'val' when config read fails Most callers of config read do not check for return value. But most of the ones that do, checks for error indication in 'val' variable. This patch updates error handling in advk_pcie_rd_conf() function. If PIO transfer fails then 'val' variable is set to 0xffffffff which indicates failture. Link: https://lore.kernel.org/r/20200528162604.GA323482@bjorn-Precision-5520 Link: https://lore.kernel.org/r/20200601130315.18895-1-pali@kernel.org Reported-by: Bjorn Helgaas Signed-off-by: Pali Rohár Signed-off-by: Lorenzo Pieralisi --- diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c index 90ff291c24f0..7872035dbb03 100644 --- a/drivers/pci/controller/pci-aardvark.c +++ b/drivers/pci/controller/pci-aardvark.c @@ -688,8 +688,10 @@ static int advk_pcie_rd_conf(struct pci_bus *bus, u32 devfn, advk_writel(pcie, 1, PIO_START); ret = advk_pcie_wait_pio(pcie); - if (ret < 0) + if (ret < 0) { + *val = 0xffffffff; return PCIBIOS_SET_FAILED; + } advk_pcie_check_pio_status(pcie);