aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNavid Emamdoost <navid.emamdoost@gmail.com>2019-09-19 10:50:02 -0500
committerPaul Gortmaker <paul.gortmaker@windriver.com>2019-12-02 14:07:21 -0500
commitcf5f620eb9ecf2fd45ae93d055e92ce4a3080554 (patch)
tree2af417cd3f2c1a81a6438b13f4bdd3ea3fd62963
parent4adc4baa97b6ac6df56361f199c2824179ef5358 (diff)
downloadlinux-yocto-cf5f620eb9ecf2fd45ae93d055e92ce4a3080554.tar.gz
linux-yocto-cf5f620eb9ecf2fd45ae93d055e92ce4a3080554.tar.bz2
linux-yocto-cf5f620eb9ecf2fd45ae93d055e92ce4a3080554.zip
iio: imu: adis16400: release allocated memory on failure
commit ab612b1daf415b62c58e130cb3d0f30b255a14d0 upstream. In adis_update_scan_mode, if allocation for adis->buffer fails, previously allocated adis->xfer needs to be released. Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> Reviewed-by: Alexandru Ardelean <alexandru.ardelean@analog.com> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--drivers/iio/imu/adis_buffer.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/iio/imu/adis_buffer.c b/drivers/iio/imu/adis_buffer.c
index 9ac8356d9a95..f446ff497809 100644
--- a/drivers/iio/imu/adis_buffer.c
+++ b/drivers/iio/imu/adis_buffer.c
@@ -78,8 +78,11 @@ int adis_update_scan_mode(struct iio_dev *indio_dev,
return -ENOMEM;
adis->buffer = kcalloc(indio_dev->scan_bytes, 2, GFP_KERNEL);
- if (!adis->buffer)
+ if (!adis->buffer) {
+ kfree(adis->xfer);
+ adis->xfer = NULL;
return -ENOMEM;
+ }
rx = adis->buffer;
tx = rx + scan_count;