]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
iio: meter: ina230: fix return value of ina230_set_channel
authorTimo Alho <talho@nvidia.com>
Thu, 12 Jun 2014 18:29:12 +0000 (21:29 +0300)
committerRiham Haidar <rhaidar@nvidia.com>
Tue, 17 Jun 2014 04:48:53 +0000 (21:48 -0700)
On success, ina230_set_channel needs to return the number of
characters written.

Change-Id: I4ed249c0c4c86792b3b590eb4c1a532dcfd57f3a
Signed-off-by: Timo Alho <talho@nvidia.com>
Reviewed-on: http://git-master/r/422792
(cherry picked from commit 0ad59e7418ae0809354e5178ee641b69deda3ad0)
Reviewed-on: http://git-master/r/422799
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
drivers/staging/iio/meter/ina230.c

index d37ad274f626d64f6036aa5759b064c73fe6aaea..d5bb34cbe6263ae02f275506e7c75280f8a9de30 100644 (file)
@@ -687,6 +687,7 @@ static ssize_t ina230_set_channel(struct device *dev,
        int mode = this_attr->address;
        long val;
        int current_ma;
+       int ret;
 
        switch (mode) {
        case CURRENT_THRESHOLD:
@@ -694,8 +695,10 @@ static ssize_t ina230_set_channel(struct device *dev,
                        return -EINVAL;
 
                current_ma = (int) val;
-               return ina230_set_current_threshold(chip, current_ma);
-
+               ret = ina230_set_current_threshold(chip, current_ma);
+               if (ret)
+                       return ret;
+               return len;
        default:
                break;
        }