staging: iio: sca3000 fix bug due to scan_element directory move.
authorJonathan Cameron <jic23@cam.ac.uk>
Thu, 7 Oct 2010 12:10:20 +0000 (13:10 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 7 Oct 2010 17:06:44 +0000 (10:06 -0700)
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 <michael.hennerich@analog.com>
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/iio/accel/sca3000_ring.c

index 8186d2b2cf4fc75112e08237915c94e31fb768cc..c872fddfb2bf755c9755844cbb0663e9adc38e62 100644 (file)
@@ -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;