2.6.33-longterm review patch.  If anyone has any objections, please let us know.

------------------

From: Michal Schmidt <mschm...@redhat.com>

commit 447c5dd7338638f526e9bcf7dcf69b4da5835c7d upstream.

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 <m...@redhat.com>
Acked-by: Greg Kroah-Hartman <gre...@suse.de>
Signed-off-by: Michal Schmidt <mschm...@redhat.com>
Signed-off-by: Jesse Barnes <jbar...@virtuousgeek.org>
Signed-off-by: Greg Kroah-Hartman <gre...@suse.de>

---
 drivers/pci/pci-sysfs.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -966,7 +966,12 @@ static ssize_t reset_store(struct device
 
        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);


_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable

Reply via email to