diff options
| author | Sebastian Ott <sebott@linux.vnet.ibm.com> | 2013-04-16 16:18:41 +0400 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-04-17 16:07:38 +0400 |
| commit | 2c3700bbb2c9c9c1d10f930d400f573d55f8e750 (patch) | |
| tree | 196296aa3f080e430d183e8ba9440e4f32b1f8b0 /arch/s390 | |
| parent | b170bad40dab1a1684d629b37cb65a5281d35bd8 (diff) | |
| download | linux-2c3700bbb2c9c9c1d10f930d400f573d55f8e750.tar.xz | |
s390/pci: return error after failed pci ops
Access to pci config space via pci_ops should not fail silently.
Reviewed-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/pci/pci.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c index 51d16f1fb5ea..6a054bf83eb0 100644 --- a/arch/s390/pci/pci.c +++ b/arch/s390/pci/pci.c @@ -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 = { |