linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: <Amy.Shih@advantech.com.tw>
To: <she90122@gmail.com>
Cc: <amy.shih@advantech.com.tw>, <oakley.ding@advantech.com.tw>,
	<jia.sui@advantech.com.cn>, Jean Delvare <jdelvare@suse.com>,
	Guenter Roeck <linux@roeck-us.net>, <linux-hwmon@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>
Subject: [v2 1/9] hwmon: (nct7904) Add error handling in probe function.
Date: Mon, 17 Jun 2019 08:08:50 +0000	[thread overview]
Message-ID: <928e46508bbe1ebc0763c3d2403a5aebe95af552.1560756733.git.amy.shih@advantech.com.tw> (raw)

From: "amy.shih" <amy.shih@advantech.com.tw>

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

Signed-off-by: amy.shih <amy.shih@advantech.com.tw>
---
Changes in v2:
- Check for errors on register read and write operations.

 drivers/hwmon/nct7904.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

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


             reply	other threads:[~2019-06-17  8:09 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-17  8:08 Amy.Shih [this message]
2019-06-17  8:10 ` [v2 2/9] hwmon: (nct7904) Changes comments in probe function Amy.Shih
2019-06-17  8:11 ` [v2 3/9] hwmon: (nct7904) Add extra sysfs support for fan, voltage and temperature Amy.Shih
2019-06-17  8:11 ` [v2 4/9] hwmon: (nct7904) Fix incorrect register setting for the high value high limit of voltage Amy.Shih
2019-06-17  8:12 ` [v2 5/9] hwmon: (nct7904) Fix incorrect register bit mapping of temperature alarm Amy.Shih
2019-06-17  8:14 ` [v2 6/9] hwmon: (nct7904) Fix wrong return code in function nct7904_write_fan Amy.Shih
2019-06-17  8:15 ` [v2 7/9] hwmon: (nct7904) Delete wrong comment in function nct7904_write_in Amy.Shih
2019-06-17  8:16 ` [v2 8/9] hwmon: (nct7904) Fix wrong attribute names for temperature Amy.Shih
2019-06-17  8:20   ` Amy.Shih
2019-06-17  8:22 ` [v2 9/9] hwmon: (nct7904) Fix wrong registers setting " Amy.Shih
2019-06-28 17:29 [v2 1/9] hwmon: (nct7904) Add error handling in probe function Guenter Roeck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=928e46508bbe1ebc0763c3d2403a5aebe95af552.1560756733.git.amy.shih@advantech.com.tw \
    --to=amy.shih@advantech.com.tw \
    --cc=jdelvare@suse.com \
    --cc=jia.sui@advantech.com.cn \
    --cc=linux-hwmon@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=oakley.ding@advantech.com.tw \
    --cc=she90122@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).