Re: [PATCH] Check return code from pdc20621_i2c_read()
From: Sergei Shtylyov <hidden>
Date: 2015-08-02 11:09:21
Also in:
lkml
Hello. On 8/2/2015 1:12 PM, Tomer Barletz wrote:
The variable spd0 might be used uninitialized when pdc20621_i2c_read() fails. This also generates a compilation warning with gcc 5.1.
Signed-off-by: Tomer Barletz <redacted> --- drivers/ata/sata_sx4.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
quoted hunk ↗ jump to hunk
diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c index 3a18a8a..bed311b 100644 --- a/drivers/ata/sata_sx4.c +++ b/drivers/ata/sata_sx4.c@@ -1238,8 +1238,11 @@ static unsigned int pdc20621_prog_dimm_global(struct ata_host *host) readl(mmio + PDC_SDRAM_CONTROL); /* Turn on for ECC */ - pdc20621_i2c_read(host, PDC_DIMM0_SPD_DEV_ADDRESS, - PDC_DIMM_SPD_TYPE, &spd0); + if (!pdc20621_i2c_read(host, PDC_DIMM0_SPD_DEV_ADDRESS, + PDC_DIMM_SPD_TYPE, &spd0)) { + printk(KERN_ERR "Failed in i2c read: device=0x%d, subaddr=0x%d\n", PDC_DIMM0_SPD_DEV_ADDRESS, PDC_DIMM_SPD_TYPE);
Please use pr_err() instead. And "0x%d" makes no sense at all, please use
"%#x" instead.
[...]quoted hunk ↗ jump to hunk
@@ -1380,8 +1383,11 @@ static unsigned int pdc20621_dimm_init(struct ata_host *host) /* ECC initiliazation. */ - pdc20621_i2c_read(host, PDC_DIMM0_SPD_DEV_ADDRESS, - PDC_DIMM_SPD_TYPE, &spd0); + if (!pdc20621_i2c_read(host, PDC_DIMM0_SPD_DEV_ADDRESS, + PDC_DIMM_SPD_TYPE, &spd0)) { + printk(KERN_ERR "Failed in i2c read: device=0x%d, subaddr=0x%d\n", PDC_DIMM0_SPD_DEV_ADDRESS, PDC_DIMM_SPD_TYPE);
Likewise.
MNR, Sergei