Skip to contentSkip to conversation

PCI: return correct value when writing to the "reset" attribute

PATCH Applied Michal Schmidt 4 participants 4 messages May 11, 2010 PCI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---

 drivers/pci/pci-sysfs.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
drivers/pci/pci-sysfs.c +6 -1
index fad9398..ba88a2f 100644
@@ -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);
Acked-by on v1 1/1
#1 lore raw
Quoted 5 lines · Michal Schmidt

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.

Quoted 23 lines

---

 drivers/pci/pci-sysfs.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
drivers/pci/pci-sysfs.c +6 -1
index fad9398..ba88a2f 100644
@@ -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);
Applied
#3 lore raw
In reply to Michal Schmidt
Quoted 18 lines · On Tue, 11 May 2010 11:44:54 +0200 Michal Schmidt <[email protected]> wrote:

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.

---

 drivers/pci/pci-sysfs.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
drivers/pci/pci-sysfs.c +0 -0
index fad9398..ba88a2f 100644
@@ -960,7 +960,12 @@ static ssize_t reset_store(struct device *dev,
 
 	if (val != 1)
 		return -EINVAL;

drivers/pci/pci-sysfs.c static ssize_t reset_store(struct device *dev, · line 971

Quoted 10 lines
drivers/pci/pci-sysfs.c +6 -1
-	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);

Applied to my linux-next branch, thanks. I think it's probably too late to get this into 2.6.34, but if it's affecting real users we can try; otherwise you could get it into the stable tree.

Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center