aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Hennerich <michael.hennerich@analog.com>2011-05-18 14:42:05 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-19 16:14:58 -0700
commitfb7f6ccac2a0651f458f8027dad5d31c9be3fff3 (patch)
tree66cbfefa73b27c2a20360dbb06f1bac5b0a4ab69
parentf535e08eb60edbfb9f8ff660c9512b498ba0e1de (diff)
downloadkernel_samsung_smdk4412-fb7f6ccac2a0651f458f8027dad5d31c9be3fff3.zip
kernel_samsung_smdk4412-fb7f6ccac2a0651f458f8027dad5d31c9be3fff3.tar.gz
kernel_samsung_smdk4412-fb7f6ccac2a0651f458f8027dad5d31c9be3fff3.tar.bz2
staging:iio:meter:ade7758: Fix return value of ade7758_write_reset
Update file comment/license header. Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/iio/meter/ade7758_core.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/iio/meter/ade7758_core.c b/drivers/staging/iio/meter/ade7758_core.c
index 8cfb617..971b247 100644
--- a/drivers/staging/iio/meter/ade7758_core.c
+++ b/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,