diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-16 17:17:25 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-16 17:17:25 -0700 |
commit | 6a2a2cdd57d11ee3117539b846a45df6efbd35b1 (patch) | |
tree | b6ab218810666a75d6612bde4d4a224118c0834c /drivers/staging/iio/meter/ade7759.c | |
parent | 8e360ec82322358056786e651322085af3ef6960 (diff) | |
parent | 5698bd757d55b1bb87edd1a9744ab09c142abfc2 (diff) | |
download | op-kernel-dev-6a2a2cdd57d11ee3117539b846a45df6efbd35b1.zip op-kernel-dev-6a2a2cdd57d11ee3117539b846a45df6efbd35b1.tar.gz |
Merge 3.6-rc6 into staging-next
This pulls in the staging tree fixes in 3.6-rc6 into our branch to resolve the
merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/iio/meter/ade7759.c')
-rw-r--r-- | drivers/staging/iio/meter/ade7759.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/iio/meter/ade7759.c b/drivers/staging/iio/meter/ade7759.c index d494052..435e35b 100644 --- a/drivers/staging/iio/meter/ade7759.c +++ b/drivers/staging/iio/meter/ade7759.c @@ -385,6 +385,8 @@ static ssize_t ade7759_write_frequency(struct device *dev, ret = strict_strtol(buf, 10, &val); if (ret) return ret; + if (val == 0) + return -EINVAL; mutex_lock(&indio_dev->mlock); |