From a528db59c606d51631e7b81a9938329a991a533c Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Thu, 7 Oct 2010 13:10:20 +0100 Subject: [PATCH] --- yaml --- r: 220144 b: refs/heads/master c: 7aa3baeb976700971acad518b3bfaad5fe1afd54 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/accel/sca3000_ring.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index dca707f439bb..22aeeca3c397 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0986452eb49771378f1cabee46c789acb088494c +refs/heads/master: 7aa3baeb976700971acad518b3bfaad5fe1afd54 diff --git a/trunk/drivers/staging/iio/accel/sca3000_ring.c b/trunk/drivers/staging/iio/accel/sca3000_ring.c index 8186d2b2cf4f..c872fddfb2bf 100644 --- a/trunk/drivers/staging/iio/accel/sca3000_ring.c +++ b/trunk/drivers/staging/iio/accel/sca3000_ring.c @@ -138,7 +138,8 @@ static ssize_t sca3000_show_ring_bpse(struct device *dev, { int len = 0, ret; u8 *rx; - struct iio_dev *indio_dev = dev_get_drvdata(dev); + struct iio_ring_buffer *ring = dev_get_drvdata(dev); + struct iio_dev *indio_dev = ring->indio_dev; struct sca3000_state *st = indio_dev->dev_data; mutex_lock(&st->lock); @@ -168,7 +169,8 @@ static ssize_t sca3000_store_ring_bpse(struct device *dev, const char *buf, size_t len) { - struct iio_dev *indio_dev = dev_get_drvdata(dev); + struct iio_ring_buffer *ring = dev_get_drvdata(dev); + struct iio_dev *indio_dev = ring->indio_dev; struct sca3000_state *st = indio_dev->dev_data; int ret; u8 *rx;