iio: pressure: mpl3115: claim direct mode during raw reads
PATCH 1/1 iio: pressure: mpl3115: claim direct mode during raw reads
Driver was checking for direct mode but not locking it. Use claim/release helper functions to guarantee the device stays in direct mode during raw reads.
Signed-off-by Alison Schofield <[email protected]>
--- drivers/iio/pressure/mpl3115.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-)
drivers/iio/pressure/mpl3115.c +14 -9
@@ -82,8 +82,9 @@ static int mpl3115_read_raw(struct iio_dev *indio_dev,switch (mask) {case IIO_CHAN_INFO_RAW : -if (iio_buffer_enabled (indio_dev)) -return -EBUSY ; + ret =iio_device_claim_direct_mode (indio_dev); +if (ret) +return ret;switch (chan->type) {case IIO_PRESSURE :/* in 0.25 pascal / LSB */
@@ -91,31 +92,35 @@ static int mpl3115_read_raw(struct iio_dev *indio_dev, ret =mpl3115_request (data);if (ret <0 ) {mutex_unlock (&data->lock); -return ret; + goto release; } ret =i2c_smbus_read_i2c_block_data (data->client,MPL3115_OUT_PRESS ,3 , (u8 *) &tmp);mutex_unlock (&data->lock);if (ret <0 ) -return ret; + goto release; *val =be32_to_cpu (tmp) >>12 ; -return IIO_VAL_INT ; + ret =IIO_VAL_INT ;case IIO_TEMP :/* in 0.0625 celsius / LSB */ mutex_lock (&data->lock); ret =mpl3115_request (data);if (ret <0 ) {mutex_unlock (&data->lock); -return ret; + goto release; } ret =i2c_smbus_read_i2c_block_data (data->client,MPL3115_OUT_TEMP ,2 , (u8 *) &tmp);mutex_unlock (&data->lock);if (ret <0 ) -return ret; + goto release; *val =sign_extend32 (be32_to_cpu (tmp) >>20 ,11 ); -return IIO_VAL_INT ; + ret =IIO_VAL_INT ;default : -return -EINVAL ; + ret = -EINVAL ; + +release: +iio_device_release_direct_mode (indio_dev); +return ret; }case IIO_CHAN_INFO_SCALE :switch (chan->type) {
Signature · 1 line
2.1.4
Quoted 5 lines · Alison Schofield
Driver was checking for direct mode but not locking it. Use claim/release helper functions to guarantee the device stays in direct mode during raw reads.
Signed-off-by Alison Schofield <[email protected]>
breaks again also the goto goes to an 'unsual location'.
You don't even need the gotos if you put that unwind code in the standard spot and use break whenever there is an error to drop out of the switch statement.
I've fixed up and applied, please take a look.
Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to play with it.
Thanks,
Jonathan
Quoted 64 lines
--- drivers/iio/pressure/mpl3115.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-)drivers/iio/pressure/mpl3115.c +14
-9@@ -82,8 +82,9 @@ static int mpl3115_read_raw(struct iio_dev *indio_dev,switch (mask) {case IIO_CHAN_INFO_RAW : -if (iio_buffer_enabled (indio_dev)) -return -EBUSY ; + ret =iio_device_claim_direct_mode (indio_dev); +if (ret) +return ret;switch (chan->type) {case IIO_PRESSURE :/* in 0.25 pascal / LSB */ @@ -91,31 +92,35 @@ static int mpl3115_read_raw(struct iio_dev *indio_dev, ret =mpl3115_request (data);if (ret <0 ) {mutex_unlock (&data->lock); -return ret; + goto release; } ret =i2c_smbus_read_i2c_block_data (data->client,MPL3115_OUT_PRESS ,3 , (u8 *) &tmp);mutex_unlock (&data->lock);if (ret <0 ) -return ret; + goto release; *val =be32_to_cpu (tmp) >>12 ; -return IIO_VAL_INT ; + ret =IIO_VAL_INT ;case IIO_TEMP :/* in 0.0625 celsius / LSB */ mutex_lock (&data->lock); ret =mpl3115_request (data);if (ret <0 ) {mutex_unlock (&data->lock); -return ret; + goto release; } ret =i2c_smbus_read_i2c_block_data (data->client,MPL3115_OUT_TEMP ,2 , (u8 *) &tmp);mutex_unlock (&data->lock);if (ret <0 ) -return ret; + goto release; *val =sign_extend32 (be32_to_cpu (tmp) >>20 ,11 ); -return IIO_VAL_INT ; + ret =IIO_VAL_INT ;default : -return -EINVAL ; + ret = -EINVAL ; + +release: +iio_device_release_direct_mode (indio_dev); +return ret; }case IIO_CHAN_INFO_SCALE :switch (chan->type) {