evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASoC: rt286: check regmap_read result for ID check

Browse source 
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>
This commit is contained in:
Bard Liao 2015-03-24 09:51:12 +08:00 • committed by Mark Brown
parent 0dd96b3e39
commit 143526ee94
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sound/soc/codecs/rt286.c
View file

@ -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, ret = regmap_read(rt286->regmap,
RT286_GET_PARAM(AC_NODE_ROOT, AC_PAR_VENDOR_ID), &ret); RT286_GET_PARAM(AC_NODE_ROOT, AC_PAR_VENDOR_ID), &val);
if (ret != RT286_VENDOR_ID && ret != RT288_VENDOR_ID) { 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;
} }