ASoC: cs35l33: Minor error paths fixups

Correct some unchecked re-allocations of ret whilst reading the device
ID and ensure the hardware state is returned to off on the error
paths.

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/20210510131357.17170-4-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/cs35l33.c b/sound/soc/codecs/cs35l33.c
index 7ad7b73..6f6b3c0 100644 (file)
--- a/sound/soc/codecs/cs35l33.c
+++ b/sound/soc/codecs/cs35l33.c
@@ -34,6 +34,7 @@
 #include <linux/of_irq.h>
 
 #include "cs35l33.h"
+#include "cirrus_legacy.h"
 
 #define CS35L33_BOOT_DELAY     50
 
@@ -1190,12 +1191,12 @@ static int cs35l33_i2c_probe(struct i2c_client *i2c_client,
        regcache_cache_only(cs35l33->regmap, false);
 
        /* initialize codec */
-       ret = regmap_read(cs35l33->regmap, CS35L33_DEVID_AB, &reg);
-       devid = (reg & 0xFF) << 12;
-       ret = regmap_read(cs35l33->regmap, CS35L33_DEVID_CD, &reg);
-       devid |= (reg & 0xFF) << 4;
-       ret = regmap_read(cs35l33->regmap, CS35L33_DEVID_E, &reg);
-       devid |= (reg & 0xF0) >> 4;
+       devid = cirrus_read_device_id(cs35l33->regmap, CS35L33_DEVID_AB);
+       if (devid < 0) {
+               ret = devid;
+               dev_err(&i2c_client->dev, "Failed to read device ID: %d\n", ret);
+               goto err_enable;
+       }
 
        if (devid != CS35L33_CHIP_ID) {
                dev_err(&i2c_client->dev,
@@ -1242,6 +1243,8 @@ static int cs35l33_i2c_probe(struct i2c_client *i2c_client,
        return 0;
 
 err_enable:
+       gpiod_set_value_cansleep(cs35l33->reset_gpio, 0);
+
        regulator_bulk_disable(cs35l33->num_core_supplies,
                               cs35l33->core_supplies);