Staging: iio: dereferencing uninitialized variable
authorDan Carpenter <error27@gmail.com>
Wed, 8 Jun 2011 06:42:21 +0000 (09:42 +0300)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 28 Jun 2011 21:48:13 +0000 (14:48 -0700)
In the error handling, it dereferences "st" before it has been
initialized.  I also just tidied it up a bit to remove some extra
conditions.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/iio/adc/max1363_core.c

index 98cebd26310f0f05321d2df5a4c8c49690b4fc4e..72b0917412eea9e115c5c694002f6d0a41f4e679 100644 (file)
@@ -1255,12 +1255,15 @@ static int __devinit max1363_probe(struct i2c_client *client,
        struct regulator *reg;
 
        reg = regulator_get(&client->dev, "vcc");
-       if (!IS_ERR(reg)) {
-               ret = regulator_enable(reg);
-               if (ret)
-                       goto error_put_reg;
+       if (IS_ERR(reg)) {
+               ret = PTR_ERR(reg);
+               goto error_out;
        }
 
+       ret = regulator_enable(reg);
+       if (ret)
+               goto error_put_reg;
+
        indio_dev = iio_allocate_device(sizeof(struct max1363_state));
        if (indio_dev == NULL) {
                ret = -ENOMEM;
@@ -1323,6 +1326,7 @@ static int __devinit max1363_probe(struct i2c_client *client,
        }
 
        return 0;
+
 error_uninit_ring:
        iio_ring_buffer_unregister(indio_dev->ring);
 error_cleanup_ring:
@@ -1335,12 +1339,10 @@ error_free_device:
        else
                iio_device_unregister(indio_dev);
 error_disable_reg:
-       if (!IS_ERR(st->reg))
-               regulator_disable(st->reg);
+       regulator_disable(reg);
 error_put_reg:
-       if (!IS_ERR(st->reg))
-               regulator_put(st->reg);
-
+       regulator_put(reg);
+error_out:
        return ret;
 }