---

yaml --- r: 259990 b: refs/heads/master c: 03bda05 h: refs/heads/master v: v3
git-mirror · Jul 6, 2011 · aec01d1 · aec01d1
1 parent fc9c83d
commit aec01d1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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);