summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2011-06-29 22:50:48 +0300
committerGreg Kroah-Hartman <gregkh@suse.de>2011-07-05 20:29:16 -0700
commit03bda05d9ced3a80b2265d9da611c6670840abc7 (patch)
tree474b5dfe89c2d083fc62182855275050fec822e8
parent857f727674f45157ec9a5d788c8954d9f082acb7 (diff)
Staging: iio: some uninitialized variable bugs
There were some uninitialized variable warnings in iio. Two of these came from the recent changes to how the private data was allocated in 83f0422dc6a16 "staging:iio:accel:sca3000: allocate state in iio_dev and use iio_priv to access." drivers/staging/iio/accel/sca3000_core.c: In function 'sca3000_probe': drivers/staging/iio/accel/sca3000_core.c:1137:9: warning: 'st' may be used uninitialized in this function drivers/staging/iio/adc/ad7291.c: In function 'ad7291_probe': drivers/staging/iio/adc/ad7291.c:805:15: warning: 'chip' may be used uninitialized in this function drivers/staging/iio/dac/ad5624r_spi.c: In function 'ad5624r_probe': drivers/staging/iio/dac/ad5624r_spi.c:228:24: warning: 'st' may be used uninitialized in this function Signed-off-by: Dan Carpenter <error27@gmail.com> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/iio/accel/sca3000_core.c1
-rw-r--r--drivers/staging/iio/adc/ad7291.c1
-rw-r--r--drivers/staging/iio/dac/ad5624r_spi.c2
3 files changed, 3 insertions, 1 deletions
diff --git a/drivers/staging/iio/accel/sca3000_core.c b/drivers/staging/iio/accel/sca3000_core.c
index 4313f731b6f6..603f5bca797c 100644
--- a/drivers/staging/iio/accel/sca3000_core.c
+++ b/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/drivers/staging/iio/adc/ad7291.c b/drivers/staging/iio/adc/ad7291.c
index f02402639142..96cbb17bc2cd 100644
--- a/drivers/staging/iio/adc/ad7291.c
+++ b/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/drivers/staging/iio/dac/ad5624r_spi.c b/drivers/staging/iio/dac/ad5624r_spi.c
index 0175cc0636a5..a5b3776718e9 100644
--- a/drivers/staging/iio/dac/ad5624r_spi.c
+++ b/drivers/staging/iio/dac/ad5624r_spi.c
@@ -276,7 +276,7 @@ error_free_dev:
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);