diff options
author | Lee Jones <lee.jones@linaro.org> | 2013-09-10 08:49:00 -0400 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2013-09-14 16:17:16 -0400 |
commit | 5bb8e72d5de375c855ce5ec9b818c7836feeb301 (patch) | |
tree | edf1831d0bba26126d482119a1f92ae58bfe1eec /drivers/iio | |
parent | 362f2f8647cfa53e36bf910b42ad084674ade9dc (diff) |
iio: sensors-core: st: Clean-up error handling in st_sensors_read_info_raw()
Saving a few lines of code.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio')
-rw-r--r-- | drivers/iio/common/st_sensors/st_sensors_core.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c index eb261a58fc68..793136aff390 100644 --- a/drivers/iio/common/st_sensors/st_sensors_core.c +++ b/drivers/iio/common/st_sensors/st_sensors_core.c | |||
@@ -352,28 +352,25 @@ int st_sensors_read_info_raw(struct iio_dev *indio_dev, | |||
352 | mutex_lock(&indio_dev->mlock); | 352 | mutex_lock(&indio_dev->mlock); |
353 | if (indio_dev->currentmode == INDIO_BUFFER_TRIGGERED) { | 353 | if (indio_dev->currentmode == INDIO_BUFFER_TRIGGERED) { |
354 | err = -EBUSY; | 354 | err = -EBUSY; |
355 | goto read_error; | 355 | goto out; |
356 | } else { | 356 | } else { |
357 | err = st_sensors_set_enable(indio_dev, true); | 357 | err = st_sensors_set_enable(indio_dev, true); |
358 | if (err < 0) | 358 | if (err < 0) |
359 | goto read_error; | 359 | goto out; |
360 | 360 | ||
361 | msleep((sdata->sensor->bootime * 1000) / sdata->odr); | 361 | msleep((sdata->sensor->bootime * 1000) / sdata->odr); |
362 | err = st_sensors_read_axis_data(indio_dev, ch, val); | 362 | err = st_sensors_read_axis_data(indio_dev, ch, val); |
363 | if (err < 0) | 363 | if (err < 0) |
364 | goto read_error; | 364 | goto out; |
365 | 365 | ||
366 | *val = *val >> ch->scan_type.shift; | 366 | *val = *val >> ch->scan_type.shift; |
367 | 367 | ||
368 | err = st_sensors_set_enable(indio_dev, false); | 368 | err = st_sensors_set_enable(indio_dev, false); |
369 | } | 369 | } |
370 | out: | ||
370 | mutex_unlock(&indio_dev->mlock); | 371 | mutex_unlock(&indio_dev->mlock); |
371 | 372 | ||
372 | return err; | 373 | return err; |
373 | |||
374 | read_error: | ||
375 | mutex_unlock(&indio_dev->mlock); | ||
376 | return err; | ||
377 | } | 374 | } |
378 | EXPORT_SYMBOL(st_sensors_read_info_raw); | 375 | EXPORT_SYMBOL(st_sensors_read_info_raw); |
379 | 376 | ||