From: Jonathan Cameron Date: Thu, 7 Oct 2010 12:10:20 +0000 (+0100) Subject: staging: iio: sca3000 fix bug due to scan_element directory move. X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=7aa3baeb976700971acad518b3bfaad5fe1afd54;p=deliverable%2Flinux.git staging: iio: sca3000 fix bug due to scan_element directory move. The device found passed to the attr functions is that of the ring buffer, not the the iio_dev so we need to bounce through one more hop to get the right address. Reported-by: Michael Hennerich Signed-off-by: Jonathan Cameron Acked-by: Michael Hennerich Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/iio/accel/sca3000_ring.c b/drivers/staging/iio/accel/sca3000_ring.c index 8186d2b2cf4f..c872fddfb2bf 100644 --- a/drivers/staging/iio/accel/sca3000_ring.c +++ b/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;