diff options
| author | Takashi Iwai <[email protected]> | 2021-05-25 06:58:01 +0000 |
|---|---|---|
| committer | Takashi Iwai <[email protected]> | 2021-05-25 06:58:01 +0000 |
| commit | dad19afce9ad93dda1a10d08afea71b6dd30f19f (patch) | |
| tree | 30e4532c8341fbf89680813d2ec2e888ef99bd85 /sound/soc/codecs/cs42l56.c | |
| parent | ALSA: usb-audio: scarlett2: snd_scarlett_gen2_controls_create() can be static (diff) | |
| parent | ASoC: qcom: lpass-cpu: Use optional clk APIs (diff) | |
| download | kernel-dad19afce9ad93dda1a10d08afea71b6dd30f19f.tar.gz kernel-dad19afce9ad93dda1a10d08afea71b6dd30f19f.zip | |
Merge tag 'asoc-fix-v5.13-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.13
A collection of fixes that have come in since the merge window, mainly
device specific things. The fixes to the generic cards from
Morimoto-san are handling regressions that were introduced in the merge
window on at least the Kontron sl28-var3-ads2.
Diffstat (limited to 'sound/soc/codecs/cs42l56.c')
| -rw-r--r-- | sound/soc/codecs/cs42l56.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/soc/codecs/cs42l56.c b/sound/soc/codecs/cs42l56.c index c44a5cdb796e..7cdffdf6b8cf 100644 --- a/sound/soc/codecs/cs42l56.c +++ b/sound/soc/codecs/cs42l56.c @@ -1175,7 +1175,7 @@ static int cs42l56_i2c_probe(struct i2c_client *i2c_client, struct cs42l56_platform_data *pdata = dev_get_platdata(&i2c_client->dev); int ret, i; - unsigned int devid = 0; + unsigned int devid; unsigned int alpha_rev, metal_rev; unsigned int reg; @@ -1245,6 +1245,11 @@ static int cs42l56_i2c_probe(struct i2c_client *i2c_client, } ret = regmap_read(cs42l56->regmap, CS42L56_CHIP_ID_1, ®); + if (ret) { + dev_err(&i2c_client->dev, "Failed to read chip ID: %d\n", ret); + return ret; + } + devid = reg & CS42L56_CHIP_ID_MASK; if (devid != CS42L56_DEVID) { dev_err(&i2c_client->dev, |