---

yaml --- r: 249839 b: refs/heads/master c: fb7f6cc h: refs/heads/master i: 249837: b64e486 249835: 78c1b36 249831: 5e3dfc4 249823: 15e45f4 v: v3
git-mirror · May 19, 2011 · 9e82401 · 9e82401
1 parent 2264b0f
commit 9e82401
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f535e08eb60edbfb9f8ff660c9512b498ba0e1de
+refs/heads/master: fb7f6ccac2a0651f458f8027dad5d31c9be3fff3
diff --git a/trunk/drivers/staging/iio/meter/ade7758_core.c b/trunk/drivers/staging/iio/meter/ade7758_core.c
@@ -1,9 +1,9 @@
 /*
- * ADE7758 Polyphase Multifunction Energy Metering IC Driver
+ * ADE7758 Poly Phase Multifunction Energy Metering IC driver
  *
- * Copyright 2010 Analog Devices Inc.
+ * Copyright 2010-2011 Analog Devices Inc.
  *
- * Licensed under the GPL-2 or later.
+ * Licensed under the GPL-2.
  */
 
 #include <linux/interrupt.h>
@@ -342,7 +342,7 @@ static ssize_t ade7758_write_reset(struct device *dev,
 	case 'Y':
 		return ade7758_reset(dev);
 	}
-	return -1;
+	return len;
 }
 
 static IIO_DEV_ATTR_VPEAK(S_IWUSR | S_IRUGO,