mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-04 08:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

iio: meter: ade7759: add error handling in _reset and _stop_device

Browse Source 
This patch adds the error handling for the value returned from
ade7759_spi_read_reg_16. With this patch, the following randconfig
warnings get fixed automatically.

drivers/staging/iio/meter/ade7759.c:224:6: warning: ‘val’ may be
used uninitialized in this function [-Wmaybe-uninitialized]
drivers/staging/iio/meter/ade7759.c:309:6: warning: ‘val’ may be
used uninitialized in this function [-Wmaybe-uninitialized]

Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Devendra Naga
2015-01-02 04:02:55 -05:00
committed by Jonathan Cameron
parent abe4e26bb7
commit 1e716a15ce
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/staging/iio/meter/ade7759.c
View File

@@ -218,9 +218,12 @@ static int ade7759_reset(struct device *dev)
int ret;
u16 val;
ade7759_spi_read_reg_16(dev,
ret = ade7759_spi_read_reg_16(dev,
ADE7759_MODE,
&val);
if (ret < 0)
return ret;
val |= 1 << 6; /* Software Chip Reset */
ret = ade7759_spi_write_reg_16(dev,
ADE7759_MODE,
@@ -301,11 +304,18 @@ static int ade7759_set_irq(struct device *dev, bool enable)
/* Power down the device */
static int ade7759_stop_device(struct device *dev)
{
int ret;
u16 val;
ade7759_spi_read_reg_16(dev,
ret = ade7759_spi_read_reg_16(dev,
ADE7759_MODE,
&val);
if (ret < 0) {
dev_err(dev, "unable to power down the device, error: %d\n",
ret);
return ret;
}
val |= 1 << 4; /* AD converters can be turned off */
return ade7759_spi_write_reg_16(dev, ADE7759_MODE, val);