mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-29 15:42:46 +00:00
Code Issues Releases Wiki Activity

s390/pci: return error after failed pci ops

Browse source 
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>
This commit is contained in:
Sebastian Ott 2013-04-16 14:18:41 +02:00 committed by Martin Schwidefsky
parent b170bad40d
commit 2c3700bbb2
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
arch/s390/pci/pci.c
View file

@ -405,20 +405,28 @@ static int pci_read(struct pci_bus *bus, unsigned int devfn, int where,
int size, u32 *val) int size, u32 *val)
{ {
struct zpci_dev *zdev = get_zdev_by_bus(bus); struct zpci_dev *zdev = get_zdev_by_bus(bus);
int ret;
if (!zdev || devfn != ZPCI_DEVFN) if (!zdev || devfn != ZPCI_DEVFN)
return 0; ret = -ENODEV;
return zpci_cfg_load(zdev, where, val, size); else
ret = zpci_cfg_load(zdev, where, val, size);
return ret;
} }
static int pci_write(struct pci_bus *bus, unsigned int devfn, int where, static int pci_write(struct pci_bus *bus, unsigned int devfn, int where,
int size, u32 val) int size, u32 val)
{ {
struct zpci_dev *zdev = get_zdev_by_bus(bus); struct zpci_dev *zdev = get_zdev_by_bus(bus);
int ret;
if (!zdev || devfn != ZPCI_DEVFN) if (!zdev || devfn != ZPCI_DEVFN)
return 0; ret = -ENODEV;
return zpci_cfg_store(zdev, where, val, size); else
ret = zpci_cfg_store(zdev, where, val, size);
return ret;
} }
static struct pci_ops pci_root_ops = { static struct pci_ops pci_root_ops = {