From 78e517c174218eaf7933f4167f30a2cfc712b844 Mon Sep 17 00:00:00 2001 From: Peter Meerwald Date: Wed, 22 Aug 2012 20:37:00 +0100 Subject: [PATCH] --- yaml --- r: 322681 b: refs/heads/master c: d1dc9c1276a4d988b29372fe67796430d5cbc756 h: refs/heads/master i: 322679: e9d80ee1f4cca593a004cfa866171f437b683248 v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/accel/lis3l02dq_ring.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8cfc6e8786a0..27a6799eef3f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 50d4b3062d6d4f165c76854a7644b1502836f9b9 +refs/heads/master: d1dc9c1276a4d988b29372fe67796430d5cbc756 diff --git a/trunk/drivers/staging/iio/accel/lis3l02dq_ring.c b/trunk/drivers/staging/iio/accel/lis3l02dq_ring.c index 18d108fd967a..f3da59063ed2 100644 --- a/trunk/drivers/staging/iio/accel/lis3l02dq_ring.c +++ b/trunk/drivers/staging/iio/accel/lis3l02dq_ring.c @@ -121,8 +121,10 @@ static int lis3l02dq_get_buffer_element(struct iio_dev *indio_dev, if (rx_array == NULL) return -ENOMEM; ret = lis3l02dq_read_all(indio_dev, rx_array); - if (ret < 0) + if (ret < 0) { + kfree(rx_array); return ret; + } for (i = 0; i < scan_count; i++) data[i] = combine_8_to_16(rx_array[i*4+1], rx_array[i*4+3]);