diff --git a/[refs] b/[refs] index df1895f3e135..268bbeb21a8f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3285aae1edd04ffdb6a732f7d90c44f90a7e5d8f +refs/heads/master: b68d58a84b42d6213e46948b8f4cb95b8ed0efec diff --git a/trunk/drivers/staging/iio/accel/sca3000_ring.c b/trunk/drivers/staging/iio/accel/sca3000_ring.c index 6d19d15c6d77..09836c4f18b8 100644 --- a/trunk/drivers/staging/iio/accel/sca3000_ring.c +++ b/trunk/drivers/staging/iio/accel/sca3000_ring.c @@ -126,8 +126,8 @@ static ssize_t sca3000_show_ring_bpse(struct device *dev, { int len = 0, ret; u8 *rx; - struct iio_ring_buffer *r = dev_get_drvdata(dev); - struct sca3000_state *st = r->indio_dev->dev_data; + struct iio_dev *indio_dev = dev_get_drvdata(dev); + struct sca3000_state *st = indio_dev->dev_data; mutex_lock(&st->lock); ret = sca3000_read_data(st, SCA3000_REG_ADDR_MODE, &rx, 1); @@ -153,8 +153,8 @@ static ssize_t sca3000_store_ring_bpse(struct device *dev, const char *buf, size_t len) { - struct iio_ring_buffer *r = dev_get_drvdata(dev); - struct sca3000_state *st = r->indio_dev->dev_data; + struct iio_dev *indio_dev = dev_get_drvdata(dev); + struct sca3000_state *st = indio_dev->dev_data; int ret; u8 *rx; long val;