diff options
| author |   Sebastian Ott <sebott@linux.vnet.ibm.com> | 2015-07-28 19:14:51 +0200 |
|---|---|---|
| committer |   Martin Schwidefsky <schwidefsky@de.ibm.com> | 2015-07-29 09:11:56 +0200 |
| commit | 2a01bd1bd3d28d1eef26d5509c95d0923f7dc75c (patch) | |
| tree | 776693351e19810266d11b367699f627e14812ed /arch/s390/pci/pci_sysfs.c | |
| parent | s390/pci: handle events for unused functions (diff) | |
| download | linux-dev-2a01bd1bd3d28d1eef26d5509c95d0923f7dc75c.tar.xz linux-dev-2a01bd1bd3d28d1eef26d5509c95d0923f7dc75c.zip | |
s390/pci: use pci_rescan_remove_lock
Make sure that we use the pci_rescan_remove_lock when we remove
or add functions from/to the bus.
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/pci/pci_sysfs.c')
| -rw-r--r-- | arch/s390/pci/pci_sysfs.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/s390/pci/pci_sysfs.c b/arch/s390/pci/pci_sysfs.c index dad920fd3606..f37a5808883d 100644 --- a/arch/s390/pci/pci_sysfs.c +++ b/arch/s390/pci/pci_sysfs.c @@ -44,17 +44,24 @@ static ssize_t recover_store(struct device *dev, struct device_attribute *attr, if (!device_remove_file_self(dev, attr)) return count; + pci_lock_rescan_remove(); pci_stop_and_remove_bus_device(pdev); ret = zpci_disable_device(zdev); if (ret) - return ret; + goto error; ret = zpci_enable_device(zdev); if (ret) - return ret; + goto error; pci_rescan_bus(zdev->bus); + pci_unlock_rescan_remove(); + return count; + +error: + pci_unlock_rescan_remove(); + return ret; } static DEVICE_ATTR_WO(recover); |