diff --git a/[refs] b/[refs]
index cf32127d2dbd..3229317adcea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bb6a12a88aeac9bab4ed0cf0da1edc03f5eb686
+refs/heads/master: 542f491542b0312f8b28e17a013f6f8f114bda68
diff --git a/trunk/drivers/staging/iio/accel/lis3l02dq_ring.c b/trunk/drivers/staging/iio/accel/lis3l02dq_ring.c
index c21198d18c90..a6b7c72a86f4 100644
--- a/trunk/drivers/staging/iio/accel/lis3l02dq_ring.c
+++ b/trunk/drivers/staging/iio/accel/lis3l02dq_ring.c
@@ -286,6 +286,7 @@ static void lis3l02dq_trigger_bh_to_ring(struct work_struct *work_s)
 	rx_array = kmalloc(4 * (st->indio_dev->scan_count), GFP_KERNEL);
 	if (rx_array == NULL) {
 		dev_err(&st->us->dev, "memory alloc failed in ring bh");
+		kfree(data);
 		return;
 	}