aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorJonathan Cameron <jic23@cam.ac.uk>2010-10-07 08:10:20 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-07 13:06:44 -0400
commit7aa3baeb976700971acad518b3bfaad5fe1afd54 (patch)
tree9b78ea1682e70b9439e0d3a1b65a9b3bdcfb366d /drivers/staging
parent0986452eb49771378f1cabee46c789acb088494c (diff)
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 <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>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/iio/accel/sca3000_ring.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/iio/accel/sca3000_ring.c b/drivers/staging/iio/accel/sca3000_ring.c
index 8186d2b2cf4..c872fddfb2b 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,
138{ 138{
139 int len = 0, ret; 139 int len = 0, ret;
140 u8 *rx; 140 u8 *rx;
141 struct iio_dev *indio_dev = dev_get_drvdata(dev); 141 struct iio_ring_buffer *ring = dev_get_drvdata(dev);
142 struct iio_dev *indio_dev = ring->indio_dev;
142 struct sca3000_state *st = indio_dev->dev_data; 143 struct sca3000_state *st = indio_dev->dev_data;
143 144
144 mutex_lock(&st->lock); 145 mutex_lock(&st->lock);
@@ -168,7 +169,8 @@ static ssize_t sca3000_store_ring_bpse(struct device *dev,
168 const char *buf, 169 const char *buf,
169 size_t len) 170 size_t len)
170{ 171{
171 struct iio_dev *indio_dev = dev_get_drvdata(dev); 172 struct iio_ring_buffer *ring = dev_get_drvdata(dev);
173 struct iio_dev *indio_dev = ring->indio_dev;
172 struct sca3000_state *st = indio_dev->dev_data; 174 struct sca3000_state *st = indio_dev->dev_data;
173 int ret; 175 int ret;
174 u8 *rx; 176 u8 *rx;