Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c3700bb authored by Sebastian Ott's avatar Sebastian Ott Committed by Martin Schwidefsky
Browse files

s390/pci: return error after failed pci ops 



Access to pci config space via pci_ops should not fail silently.

Reviewed-by: default avatarGerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent b170bad4

arch/s390/pci/pci.c

+12 −4
Original line number Diff line number Diff line
@@ -405,20 +405,28 @@ static int pci_read(struct pci_bus *bus, unsigned int devfn, int where, 
		    int size, u32 *val)

{

	struct zpci_dev *zdev = get_zdev_by_bus(bus);

	int ret;



	if (!zdev || devfn != ZPCI_DEVFN)

		return 0;

	return zpci_cfg_load(zdev, where, val, size);

		ret = -ENODEV;

	else

		ret = zpci_cfg_load(zdev, where, val, size);



	return ret;

}



static int pci_write(struct pci_bus *bus, unsigned int devfn, int where,

		     int size, u32 val)

{

	struct zpci_dev *zdev = get_zdev_by_bus(bus);

	int ret;



	if (!zdev || devfn != ZPCI_DEVFN)

		return 0;

	return zpci_cfg_store(zdev, where, val, size);

		ret = -ENODEV;

	else

		ret = zpci_cfg_store(zdev, where, val, size);



	return ret;

}



static struct pci_ops pci_root_ops = {