hwmon: (nct7904) Add error handling in probe function.

When register read and write operations return errors, needs to add
error handling.

Signed-off-by: amy.shih <amy.shih@advantech.com.tw>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
amy.shih 2019-06-17 08:08:50 +00:00 коммит произвёл Guenter Roeck
Родитель 23297edbc1
Коммит b3e2606787
1 изменённых файлов: 18 добавлений и 5 удалений

Просмотреть файл

@ -506,6 +506,8 @@ static int nct7904_probe(struct i2c_client *client,
/* CPU_TEMP attributes */ /* CPU_TEMP attributes */
ret = nct7904_read_reg(data, BANK_0, VT_ADC_CTRL0_REG); ret = nct7904_read_reg(data, BANK_0, VT_ADC_CTRL0_REG);
if (ret < 0)
return ret;
if ((ret & 0x6) == 0x6) if ((ret & 0x6) == 0x6)
data->tcpu_mask |= 1; /* TR1 */ data->tcpu_mask |= 1; /* TR1 */
@ -518,11 +520,15 @@ static int nct7904_probe(struct i2c_client *client,
/* LTD */ /* LTD */
ret = nct7904_read_reg(data, BANK_0, VT_ADC_CTRL2_REG); ret = nct7904_read_reg(data, BANK_0, VT_ADC_CTRL2_REG);
if (ret < 0)
return ret;
if ((ret & 0x02) == 0x02) if ((ret & 0x02) == 0x02)
data->tcpu_mask |= 0x10; data->tcpu_mask |= 0x10;
/* Multi-Function detecting for Volt and TR/TD */ /* Multi-Function detecting for Volt and TR/TD */
ret = nct7904_read_reg(data, BANK_0, VT_ADC_MD_REG); ret = nct7904_read_reg(data, BANK_0, VT_ADC_MD_REG);
if (ret < 0)
return ret;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
val = (ret & (0x03 << i)) >> (i * 2); val = (ret & (0x03 << i)) >> (i * 2);
@ -533,22 +539,29 @@ static int nct7904_probe(struct i2c_client *client,
/* PECI */ /* PECI */
ret = nct7904_read_reg(data, BANK_2, PFE_REG); ret = nct7904_read_reg(data, BANK_2, PFE_REG);
if (ret < 0)
return ret;
if (ret & 0x80) { if (ret & 0x80) {
data->enable_dts = 1; //Enable DTS & PECI data->enable_dts = 1; //Enable DTS & PECI
} else { } else {
ret = nct7904_read_reg(data, BANK_2, TSI_CTRL_REG); ret = nct7904_read_reg(data, BANK_2, TSI_CTRL_REG);
if (ret < 0)
return ret;
if (ret & 0x80) if (ret & 0x80)
data->enable_dts = 0x3; //Enable DTS & TSI data->enable_dts = 0x3; //Enable DTS & TSI
} }
/* Check DTS enable status */ /* Check DTS enable status */
if (data->enable_dts) { if (data->enable_dts) {
data->has_dts = ret = nct7904_read_reg(data, BANK_0, DTS_T_CTRL0_REG);
nct7904_read_reg(data, BANK_0, DTS_T_CTRL0_REG) & 0xF; if (ret < 0)
return ret;
data->has_dts = ret & 0xF;
if (data->enable_dts & 0x2) { if (data->enable_dts & 0x2) {
data->has_dts |= ret = nct7904_read_reg(data, BANK_0, DTS_T_CTRL1_REG);
(nct7904_read_reg(data, BANK_0, DTS_T_CTRL1_REG) & 0xF) if (ret < 0)
<< 4; return ret;
data->has_dts |= (ret & 0xF) << 4;
} }
} }