From b2dbbd978d641bf8fd0918f3480ebe8d4d24f223 Mon Sep 17 00:00:00 2001
From: Michal Schmidt <mschmidt@redhat.com>
Date: Tue, 11 May 2010 11:44:54 +0200
Subject: [PATCH] --- yaml --- r: 197900 b: refs/heads/master c:
 447c5dd7338638f526e9bcf7dcf69b4da5835c7d h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/pci/pci-sysfs.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 313de29ef689..e26491471271 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3196180a54b593838c0b6496e5b524a2f69bb190
+refs/heads/master: 447c5dd7338638f526e9bcf7dcf69b4da5835c7d
diff --git a/trunk/drivers/pci/pci-sysfs.c b/trunk/drivers/pci/pci-sysfs.c
index 941e939d1da9..89a08ed39c94 100644
--- a/trunk/drivers/pci/pci-sysfs.c
+++ b/trunk/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);