ASoC: rt1015: check the return value of regmap_read during i2c probe
authorDerek Fang <derek.fang@realtek.com>
Wed, 9 Dec 2020 09:13:08 +0000 (17:13 +0800)
committerMark Brown <broonie@kernel.org>
Wed, 9 Dec 2020 12:13:44 +0000 (12:13 +0000)
In some projects, the device ID register is not read correctly.
This patch helps to verify the issue is caused from i2c host or client.

Signed-off-by: Derek Fang <derek.fang@realtek.com>
Link: https://lore.kernel.org/r/20201209091308.2823-1-derek.fang@realtek.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/rt1015.c

index ac4c9f43b338a54f9dbc0ed97576afe121390586..32e6bcf763d1d95ca280a1974fe531e2d0259769 100644 (file)
@@ -1207,8 +1207,13 @@ static int rt1015_i2c_probe(struct i2c_client *i2c,
 
        rt1015->hw_config = (i2c->addr == 0x29) ? RT1015_HW_29 : RT1015_HW_28;
 
-       regmap_read(rt1015->regmap, RT1015_DEVICE_ID, &val);
-       if ((val != RT1015_DEVICE_ID_VAL) && (val != RT1015_DEVICE_ID_VAL2)) {
+       ret = regmap_read(rt1015->regmap, RT1015_DEVICE_ID, &val);
+       if (ret) {
+               dev_err(&i2c->dev,
+                       "Failed to read device register: %d\n", ret);
+               return ret;
+       } else if ((val != RT1015_DEVICE_ID_VAL) &&
+                       (val != RT1015_DEVICE_ID_VAL2)) {
                dev_err(&i2c->dev,
                        "Device with ID register %x is not rt1015\n", val);
                return -ENODEV;