git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
[pandora-kernel.git]
/
drivers
/
pci
/
pci-sysfs.c
diff --git
a/drivers/pci/pci-sysfs.c
b/drivers/pci/pci-sysfs.c
index
6309c5a
..
c9957f6
100644
(file)
--- a/
drivers/pci/pci-sysfs.c
+++ b/
drivers/pci/pci-sysfs.c
@@
-979,7
+979,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);