diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-01-25 10:52:40 -0500 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2016-01-30 11:24:24 -0500 |
commit | 7e1da86339f29e445e40d41132c30741df8c19ad (patch) | |
tree | 55ec842855bdbb7245fc9fc36080b9c63fd26b87 | |
parent | 431386e783a3a6c8b7707bee32d18c353b8688b2 (diff) |
iio: ade7753: avoid uninitialized data
The ade7753_spi_read_reg_16() will either successfully read a value
from SPI, or return a failure code without delivering data. However,
the ade7753_stop_device() and ade7753_reset() functions use the returned
data without checking for an error condition first. Gcc detects this
as a possible bug and warns about it:
drivers/staging/iio/meter/ade7753.c: In function 'ade7753_remove':
drivers/staging/iio/meter/ade7753.c:348:6: error: 'val' may be used uninitialized in this function [-Werror=maybe-uninitialized]
val |= BIT(4); /* AD converters can be turned off */
^
drivers/staging/iio/meter/ade7753.c:345:6: note: 'val' was declared here
u16 val;
^
drivers/staging/iio/meter/ade7753.c: In function 'ade7753_probe':
drivers/staging/iio/meter/ade7753.c:222:6: error: 'val' may be used uninitialized in this function [-Werror=maybe-uninitialized]
In both cases, we can avoids the warning by checking the return code
before using the data.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-rw-r--r-- | drivers/staging/iio/meter/ade7753.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/staging/iio/meter/ade7753.c b/drivers/staging/iio/meter/ade7753.c index f129039bece3..69287108f793 100644 --- a/drivers/staging/iio/meter/ade7753.c +++ b/drivers/staging/iio/meter/ade7753.c | |||
@@ -217,8 +217,12 @@ error_ret: | |||
217 | static int ade7753_reset(struct device *dev) | 217 | static int ade7753_reset(struct device *dev) |
218 | { | 218 | { |
219 | u16 val; | 219 | u16 val; |
220 | int ret; | ||
221 | |||
222 | ret = ade7753_spi_read_reg_16(dev, ADE7753_MODE, &val); | ||
223 | if (ret) | ||
224 | return ret; | ||
220 | 225 | ||
221 | ade7753_spi_read_reg_16(dev, ADE7753_MODE, &val); | ||
222 | val |= BIT(6); /* Software Chip Reset */ | 226 | val |= BIT(6); /* Software Chip Reset */ |
223 | 227 | ||
224 | return ade7753_spi_write_reg_16(dev, ADE7753_MODE, val); | 228 | return ade7753_spi_write_reg_16(dev, ADE7753_MODE, val); |
@@ -343,8 +347,12 @@ error_ret: | |||
343 | static int ade7753_stop_device(struct device *dev) | 347 | static int ade7753_stop_device(struct device *dev) |
344 | { | 348 | { |
345 | u16 val; | 349 | u16 val; |
350 | int ret; | ||
351 | |||
352 | ret = ade7753_spi_read_reg_16(dev, ADE7753_MODE, &val); | ||
353 | if (ret) | ||
354 | return ret; | ||
346 | 355 | ||
347 | ade7753_spi_read_reg_16(dev, ADE7753_MODE, &val); | ||
348 | val |= BIT(4); /* AD converters can be turned off */ | 356 | val |= BIT(4); /* AD converters can be turned off */ |
349 | 357 | ||
350 | return ade7753_spi_write_reg_16(dev, ADE7753_MODE, val); | 358 | return ade7753_spi_write_reg_16(dev, ADE7753_MODE, val); |