From b0daf8c1edda721bbd3079986d22192478389b90 Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Wed, 26 Oct 2011 17:27:40 +0100 Subject: [PATCH] --- yaml --- r: 280993 b: refs/heads/master c: 4c3d15358a7ffdd587acc02ec91d28989334d4be h: refs/heads/master i: 280991: dcc3b861fcf7b412bee342263b0e20c0deee0752 v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/kfifo_buf.c | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index efc872885bbe..761bcfce947b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e69616b1e65cb9d3dcf34399e8fac331911abfe5 +refs/heads/master: 4c3d15358a7ffdd587acc02ec91d28989334d4be diff --git a/trunk/drivers/staging/iio/kfifo_buf.c b/trunk/drivers/staging/iio/kfifo_buf.c index e8c234bb18f0..fd98a0ebb5ff 100644 --- a/trunk/drivers/staging/iio/kfifo_buf.c +++ b/trunk/drivers/staging/iio/kfifo_buf.c @@ -150,16 +150,9 @@ static int iio_store_to_kfifo(struct iio_buffer *r, { int ret; struct iio_kfifo *kf = iio_to_kfifo(r); - u8 *datal = kmalloc(r->bytes_per_datum, GFP_KERNEL); - memcpy(datal, data, r->bytes_per_datum - sizeof(timestamp)); - memcpy(datal + r->bytes_per_datum - sizeof(timestamp), - ×tamp, sizeof(timestamp)); ret = kfifo_in(&kf->kf, data, r->bytes_per_datum); - if (ret != r->bytes_per_datum) { - kfree(datal); + if (ret != r->bytes_per_datum) return -EBUSY; - } - kfree(datal); return 0; }