From 071875585cbabe2b0ab67b941177d5c9aba6c288 Mon Sep 17 00:00:00 2001 From: Manuel Stahl Date: Tue, 31 Aug 2010 11:32:51 +0200 Subject: [PATCH] --- yaml --- r: 219649 b: refs/heads/master c: 07e6229e42e4d679cdbaada8f7966491c69710e7 h: refs/heads/master i: 219647: 991ee1ab4022a70f518c9ca9c41fc031babe3019 v: v3 --- [refs] | 2 +- .../staging/iio/accel/lis3l02dq_ring.c | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 08e2c8cadb3e..30c27f4584ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ffcab07a7479e10eddda6c4c47f69834e2971716 +refs/heads/master: 07e6229e42e4d679cdbaada8f7966491c69710e7 diff --git a/trunk/drivers/staging/iio/accel/lis3l02dq_ring.c b/trunk/drivers/staging/iio/accel/lis3l02dq_ring.c index 4c1b36a76c45..9ad04f0bb709 100644 --- a/trunk/drivers/staging/iio/accel/lis3l02dq_ring.c +++ b/trunk/drivers/staging/iio/accel/lis3l02dq_ring.c @@ -479,7 +479,7 @@ int lis3l02dq_configure_ring(struct iio_dev *indio_dev) { int ret; struct iio_sw_ring_helper_state *h = iio_dev_get_devdata(indio_dev); - + struct iio_ring_buffer *ring; INIT_WORK(&h->work_trigger_to_ring, lis3l02dq_trigger_bh_to_ring); /* Set default scan mode */ h->get_ring_element = &lis3l02dq_get_ring_element; @@ -490,17 +490,18 @@ int lis3l02dq_configure_ring(struct iio_dev *indio_dev) indio_dev->scan_el_attrs = &lis3l02dq_scan_el_group; - indio_dev->ring = iio_sw_rb_allocate(indio_dev); - if (!indio_dev->ring) + ring = iio_sw_rb_allocate(indio_dev); + if (!ring) return -ENOMEM; + indio_dev->ring = ring; /* Effectively select the ring buffer implementation */ - iio_ring_sw_register_funcs(&indio_dev->ring->access); - indio_dev->ring->bpe = 2; - indio_dev->ring->preenable = &iio_sw_ring_preenable; - indio_dev->ring->postenable = &iio_triggered_ring_postenable; - indio_dev->ring->predisable = &iio_triggered_ring_predisable; - indio_dev->ring->owner = THIS_MODULE; + iio_ring_sw_register_funcs(&ring->access); + ring->bpe = 2; + ring->preenable = &iio_sw_ring_preenable; + ring->postenable = &iio_triggered_ring_postenable; + ring->predisable = &iio_triggered_ring_predisable; + ring->owner = THIS_MODULE; ret = iio_alloc_pollfunc(indio_dev, NULL, &lis3l02dq_poll_func_th); if (ret)