[PATCH 13/20] iio: sensors-core: st: Clean-up error handling in st_sensors_read_axis_data()
From: jic23@kernel.org (Jonathan Cameron)
Date: 2013-09-21 11:51:42
Also in:
linux-iio, lkml
On 09/16/13 17:02, Lee Jones wrote:
Gets rid of those unnecessary gotos. Signed-off-by: Lee Jones <redacted>
Applied to the togreg branch of iio.git Thanks Lee.
quoted hunk ↗ jump to hunk
--- drivers/iio/common/st_sensors/st_sensors_core.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c index c5fbe58..76e573b 100644 --- a/drivers/iio/common/st_sensors/st_sensors_core.c +++ b/drivers/iio/common/st_sensors/st_sensors_core.c@@ -331,10 +331,8 @@ static int st_sensors_read_axis_data(struct iio_dev *indio_dev, unsigned int byte_for_channel = ch->scan_type.storagebits >> 3; outdata = kmalloc(byte_for_channel, GFP_KERNEL); - if (!outdata) { - err = -EINVAL; - goto st_sensors_read_axis_data_error; - } + if (!outdata) + return -ENOMEM; err = sdata->tf->read_multiple_byte(&sdata->tb, sdata->dev, ch->address, byte_for_channel,@@ -349,7 +347,7 @@ static int st_sensors_read_axis_data(struct iio_dev *indio_dev, st_sensors_free_memory: kfree(outdata); -st_sensors_read_axis_data_error: + return err; }