浏览代码

ASoC: rt286: check regmap_read result for ID check

It is worth to check the regmap_read result for ID check since it
is the first regmap_read. And we can check if there is any i2c
issue.

Signed-off-by: Bard Liao <bardliao@realtek.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Bard Liao 10 年之前
父节点
当前提交
143526ee94
共有 1 个文件被更改,包括 9 次插入5 次删除
  1. 9 5
      sound/soc/codecs/rt286.c

+ 9 - 5
sound/soc/codecs/rt286.c

@@ -1219,7 +1219,7 @@ static int rt286_i2c_probe(struct i2c_client *i2c,
 {
 {
 	struct rt286_platform_data *pdata = dev_get_platdata(&i2c->dev);
 	struct rt286_platform_data *pdata = dev_get_platdata(&i2c->dev);
 	struct rt286_priv *rt286;
 	struct rt286_priv *rt286;
-	int i, ret;
+	int i, ret, val;
 
 
 	rt286 = devm_kzalloc(&i2c->dev,	sizeof(*rt286),
 	rt286 = devm_kzalloc(&i2c->dev,	sizeof(*rt286),
 				GFP_KERNEL);
 				GFP_KERNEL);
@@ -1234,11 +1234,15 @@ static int rt286_i2c_probe(struct i2c_client *i2c,
 		return ret;
 		return ret;
 	}
 	}
 
 
-	regmap_read(rt286->regmap,
-		RT286_GET_PARAM(AC_NODE_ROOT, AC_PAR_VENDOR_ID), &ret);
-	if (ret != RT286_VENDOR_ID && ret != RT288_VENDOR_ID) {
+	ret = regmap_read(rt286->regmap,
+		RT286_GET_PARAM(AC_NODE_ROOT, AC_PAR_VENDOR_ID), &val);
+	if (ret != 0) {
+		dev_err(&i2c->dev, "I2C error %d\n", ret);
+		return ret;
+	}
+	if (val != RT286_VENDOR_ID && val != RT288_VENDOR_ID) {
 		dev_err(&i2c->dev,
 		dev_err(&i2c->dev,
-			"Device with ID register %x is not rt286\n", ret);
+			"Device with ID register %x is not rt286\n", val);
 		return -ENODEV;
 		return -ENODEV;
 	}
 	}