From aec01d142a855eba1890d69745548f3277fffa88 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Wed, 29 Jun 2011 22:50:48 +0300
Subject: [PATCH] --- yaml --- r: 259990 b: refs/heads/master c:
 03bda05d9ced3a80b2265d9da611c6670840abc7 h: refs/heads/master v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/staging/iio/accel/sca3000_core.c | 1 +
 trunk/drivers/staging/iio/adc/ad7291.c         | 1 +
 trunk/drivers/staging/iio/dac/ad5624r_spi.c    | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ec7286c2743c..a487126ab705 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 857f727674f45157ec9a5d788c8954d9f082acb7
+refs/heads/master: 03bda05d9ced3a80b2265d9da611c6670840abc7
diff --git a/trunk/drivers/staging/iio/accel/sca3000_core.c b/trunk/drivers/staging/iio/accel/sca3000_core.c
index 4313f731b6f6..603f5bca797c 100644
--- a/trunk/drivers/staging/iio/accel/sca3000_core.c
+++ b/trunk/drivers/staging/iio/accel/sca3000_core.c
@@ -1133,6 +1133,7 @@ static int __devinit sca3000_probe(struct spi_device *spi)
 		goto error_ret;
 	}
 
+	st = iio_priv(indio_dev);
 	spi_set_drvdata(spi, indio_dev);
 	st->us = spi;
 	mutex_init(&st->lock);
diff --git a/trunk/drivers/staging/iio/adc/ad7291.c b/trunk/drivers/staging/iio/adc/ad7291.c
index f02402639142..96cbb17bc2cd 100644
--- a/trunk/drivers/staging/iio/adc/ad7291.c
+++ b/trunk/drivers/staging/iio/adc/ad7291.c
@@ -799,6 +799,7 @@ static int __devinit ad7291_probe(struct i2c_client *client,
 		ret = -ENOMEM;
 		goto error_ret;
 	}
+	chip = iio_priv(indio_dev);
 	/* this is only used for device removal purposes */
 	i2c_set_clientdata(client, indio_dev);
 
diff --git a/trunk/drivers/staging/iio/dac/ad5624r_spi.c b/trunk/drivers/staging/iio/dac/ad5624r_spi.c
index 0175cc0636a5..a5b3776718e9 100644
--- a/trunk/drivers/staging/iio/dac/ad5624r_spi.c
+++ b/trunk/drivers/staging/iio/dac/ad5624r_spi.c
@@ -276,7 +276,7 @@ static int __devinit ad5624r_probe(struct spi_device *spi)
 	iio_free_device(indio_dev);
 error_disable_reg:
 	if (!IS_ERR(reg))
-		regulator_disable(st->reg);
+		regulator_disable(reg);
 error_put_reg:
 	if (!IS_ERR(reg))
 		regulator_put(reg);