Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 143526ee authored by Bard Liao's avatar Bard Liao Committed by Mark Brown
Browse files

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: default avatarBard Liao <bardliao@realtek.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0dd96b3e

sound/soc/codecs/rt286.c

+9 −5
Original line number Diff line number Diff line
@@ -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_priv *rt286;

	int i, ret;

	int i, ret, val;



	rt286 = devm_kzalloc(&i2c->dev,	sizeof(*rt286),

				GFP_KERNEL);
@@ -1234,11 +1234,15 @@ static int rt286_i2c_probe(struct i2c_client *i2c, 
		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,

			"Device with ID register %x is not rt286\n", ret);

			"Device with ID register %x is not rt286\n", val);

		return -ENODEV;

	}