diff options
| author | Jinyoung Park <jinyoungp@nvidia.com> | 2013-06-20 17:55:41 +0900 |
|---|---|---|
| committer | Gabby Lee <galee@nvidia.com> | 2013-06-25 23:31:24 -0700 |
| commit | f8664172759b7846bd046779c1ca4be672a6fee8 (patch) | |
| tree | e0292f76b0663a76d5d2c3b31e802b915f4827c0 /drivers/staging | |
| parent | 49178ad8b6616fd582ceec8ebd0fb8030124f90b (diff) | |
staging: iio: Support second value read back on iio_st_read_channel_raw
Support second value read back on iio_st_read_channel_raw.
Bug 1287901
Change-Id: I2d5eb06ae3434fbca8a92591e8b498340371c771
Signed-off-by: Jinyoung Park <jinyoungp@nvidia.com>
Reviewed-on: http://git-master/r/241373
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Diwakar Tundlam <dtundlam@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/iio/iio_hwmon.c | 2 | ||||
| -rw-r--r-- | drivers/staging/iio/inkern.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/iio/iio_hwmon.c b/drivers/staging/iio/iio_hwmon.c index b03554fee443..acdfccf0bade 100644 --- a/drivers/staging/iio/iio_hwmon.c +++ b/drivers/staging/iio/iio_hwmon.c @@ -52,7 +52,7 @@ static ssize_t iio_hwmon_read_val(struct device *dev, * the scale has changed. */ ret = iio_st_read_channel_raw(&state->channels[sattr->index], - &val); + &val, 0); if (ret < 0) return ret; diff --git a/drivers/staging/iio/inkern.c b/drivers/staging/iio/inkern.c index 49346b5da50f..2802a9106023 100644 --- a/drivers/staging/iio/inkern.c +++ b/drivers/staging/iio/inkern.c @@ -232,9 +232,9 @@ void iio_st_channel_release_all(struct iio_channel *channels) } EXPORT_SYMBOL_GPL(iio_st_channel_release_all); -int iio_st_read_channel_raw(struct iio_channel *chan, int *val) +int iio_st_read_channel_raw(struct iio_channel *chan, int *val, int *val2) { - int val2, ret; + int ret; mutex_lock(&chan->indio_dev->info_exist_lock); if (chan->indio_dev->info == NULL) { @@ -243,7 +243,7 @@ int iio_st_read_channel_raw(struct iio_channel *chan, int *val) } ret = chan->indio_dev->info->read_raw(chan->indio_dev, chan->channel, - val, &val2, 0); + val, val2, 0); err_unlock: mutex_unlock(&chan->indio_dev->info_exist_lock); |