summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2010-05-11 11:44:54 +0200
committerJesse Barnes <jbarnes@virtuousgeek.org>2010-05-11 12:01:11 -0700
commit447c5dd7338638f526e9bcf7dcf69b4da5835c7d (patch)
tree09385ef825cd7ddb27aff74f5857cbe8ddd903ad /drivers/pci
parent3196180a54b593838c0b6496e5b524a2f69bb190 (diff)
downloadblackbird-op-linux-447c5dd7338638f526e9bcf7dcf69b4da5835c7d.tar.gz
blackbird-op-linux-447c5dd7338638f526e9bcf7dcf69b4da5835c7d.zip
PCI: return correct value when writing to the "reset" attribute
A successful write() to the "reset" sysfs attribute should return the number of bytes written, not 0. Otherwise userspace (bash) retries the write over and over again. Acked-by: Michael S. Tsirkin <mst@redhat.com> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Michal Schmidt <mschmidt@redhat.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/pci-sysfs.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 941e939d1da9..89a08ed39c94 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -960,7 +960,12 @@ static ssize_t reset_store(struct device *dev,
if (val != 1)
return -EINVAL;
- return pci_reset_function(pdev);
+
+ result = pci_reset_function(pdev);
+ if (result < 0)
+ return result;
+
+ return count;
}
static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_store);
OpenPOWER on IntegriCloud