From 77674cc5aad40a399bbe078cd126d5c097a5812d Mon Sep 17 00:00:00 2001 From: Sebastian Ott Date: Tue, 16 Apr 2013 14:18:41 +0200 Subject: [PATCH] --- yaml --- r: 362803 b: refs/heads/master c: 2c3700bbb2c9c9c1d10f930d400f573d55f8e750 h: refs/heads/master i: 362801: 0fb38832e92a90202abe7fdcc7e30564de09b085 362799: a79e2da3f08e340b3beae97f0909af3dfcda12a2 v: v3 --- [refs] | 2 +- trunk/arch/s390/pci/pci.c | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c95119915dbe..7b08e74a8018 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b170bad40dab1a1684d629b37cb65a5281d35bd8 +refs/heads/master: 2c3700bbb2c9c9c1d10f930d400f573d55f8e750 diff --git a/trunk/arch/s390/pci/pci.c b/trunk/arch/s390/pci/pci.c index 51d16f1fb5ea..6a054bf83eb0 100644 --- a/trunk/arch/s390/pci/pci.c +++ b/trunk/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 = {