From 6984a6da982e209022e92aa58ed9bc8270136e90 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Fri, 11 Sep 2009 18:22:27 +0200 Subject: [PATCH] --- yaml --- r: 162567 b: refs/heads/master c: 542f491542b0312f8b28e17a013f6f8f114bda68 h: refs/heads/master i: 162565: b8f260ce7aa52a5cc8df177f441c9c9e566cfc1f 162563: 4e2d849a6c69a77b760920c641a3317a6aa005a6 162559: 8fce62315e92a5531c91b089051f53362061e64e v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/accel/lis3l02dq_ring.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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; }