OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b1078e9
)
ASoC: cs42l52: Minor tidy up of error paths
author
Charles Keepax
<ckeepax@opensource.cirrus.com>
Tue, 11 May 2021 17:57:18 +0000
(18:57 +0100)
committer
Mark Brown
<broonie@kernel.org>
Wed, 12 May 2021 12:00:40 +0000
(13:00 +0100)
Fixup a needlessly initialised variable and an unchecked return
value.
Reported-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link:
https://lore.kernel.org/r/20210511175718.15416-5-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/cs42l56.c
patch
|
blob
|
history
diff --git
a/sound/soc/codecs/cs42l56.c
b/sound/soc/codecs/cs42l56.c
index
c44a5cd
..
7cdffdf
100644
(file)
--- 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,