[PATCH 3/3] ASoC: sgtl5000: Defer probe in case of I2C error

Fabio Estevam
2013-06-25T14:00:01Z

In case of I2C error, let's defer the probe.

On mx28, for example, the first read of the codec revision register fails
because there is no codec clock provided at this point. The codec clock will be
enabled later in the mxs-saif driver, so return -EPROBE_DEFER in case of I2C
read error, so that the codec driver can do another attempt at a later stage
when the codec clock is available.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
sound/soc/codecs/sgtl5000.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
index d441559..a2dce4a 100644
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -1536,9 +1536,12 @@ static int sgtl5000_i2c_probe(struct i2c_client *client,

/* read chip information */
ret = regmap_read(sgtl5000->regmap, SGTL5000_CHIP_ID, &reg);
- if (ret)
+ if (ret) {
+ ret = -EPROBE_DEFER; /* If I2C read failed, try again later */
goto disable_clk;

+ }
+
if (((reg & SGTL5000_PARTID_MASK) >> SGTL5000_PARTID_SHIFT) !=
SGTL5000_PARTID_PART_ID) {
dev_err(&client->dev,
--
1.8.1.2