renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-11 15:14:03 +08:00
Code

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

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

drivers/staging/iio/meter/ade7754.c:222:6: warning: ‘val’ may be used
uninitialized in this function [-Wmaybe-uninitialized]
drivers/staging/iio/meter/ade7754.c:368: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:54 -05:00 committed by Jonathan Cameron
parent 178cf7de6f
commit abe4e26bb7
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/iio/meter/ade7754.c
View File

@ -216,9 +216,13 @@ error_ret:
static int ade7754_reset(struct device *dev) static int ade7754_reset(struct device *dev)
{ {
int ret;
u8 val; u8 val;
ade7754_spi_read_reg_8(dev, ADE7754_OPMODE, &val); ret = ade7754_spi_read_reg_8(dev, ADE7754_OPMODE, &val);
if (ret < 0)
return ret;
val |= 1 << 6; /* Software Chip Reset */ val |= 1 << 6; /* Software Chip Reset */
return ade7754_spi_write_reg_8(dev, ADE7754_OPMODE, val); return ade7754_spi_write_reg_8(dev, ADE7754_OPMODE, val);
} }
@ -362,9 +366,16 @@ error_ret:
/* Power down the device */ /* Power down the device */
static int ade7754_stop_device(struct device *dev) static int ade7754_stop_device(struct device *dev)
{ {
int ret;
u8 val; u8 val;
ade7754_spi_read_reg_8(dev, ADE7754_OPMODE, &val); ret = ade7754_spi_read_reg_8(dev, ADE7754_OPMODE, &val);
if (ret < 0) {
dev_err(dev, "unable to power down the device, error: %d",
ret);
return ret;
}
val |= 7 << 3; /* ADE7754 powered down */ val |= 7 << 3; /* ADE7754 powered down */
return ade7754_spi_write_reg_8(dev, ADE7754_OPMODE, val); return ade7754_spi_write_reg_8(dev, ADE7754_OPMODE, val);
} }