[Linux-kernel-commits] [9335] trunk/drivers/staging/iio/accel/sca3000_ring.c: merge from upstream: staging: iio: sca3000 fix sca3000_[show, store]_ring_bpse

[vapier]

Title: [9335] trunk/drivers/staging/iio/accel/sca3000_ring.c: merge from upstream: staging: iio: sca3000 fix sca3000_[show,store]_ring_bpse

Revision

9335

Author

vapier

Date

2010-10-24 16:41:14 -0400 (Sun, 24 Oct 2010)

Log Message

merge from upstream: staging: iio: sca3000 fix sca3000_[show,store]_ring_bpse

From: Manuel Stahl <s...@iis.fraunhofer.de>

Signed-off-by: Manuel Stahl <manuel.st...@iis.fraunhofer.de>
Acked-by: Jonathan Cameron <ji...@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gre...@suse.de>

Modified Paths

• trunk/drivers/staging/iio/accel/sca3000_ring.c

Diff

Modified: trunk/drivers/staging/iio/accel/sca3000_ring.c (9334 => 9335)

--- trunk/drivers/staging/iio/accel/sca3000_ring.c	2010-10-24 20:41:10 UTC (rev 9334)
+++ trunk/drivers/staging/iio/accel/sca3000_ring.c	2010-10-24 20:41:14 UTC (rev 9335)
@@ -126,8 +126,8 @@
 {
 	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 @@
 				      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;

_______________________________________________
Linux-kernel-commits mailing list
Linux-kernel-commits@blackfin.uclinux.org
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits