diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2016-08-24 16:24:15 -0700 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2016-09-29 15:21:22 +0200 |
| commit | 438ef6415201803959394c6597a4c8ed012543de (patch) | |
| tree | eee302993c1ba88c61db4f82c3b2111d2a7affb6 | |
| parent | 716b9cbb91450161b36a4fe686c75449a1d355ad (diff) | |
Revert "sgtl5000.c: HACK, defer probe when I2C not yet running"
This reverts commit 150c9ee190ebd236f7693b82b9328d49440d0a33.
Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
| -rw-r--r-- | sound/soc/codecs/sgtl5000.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index 0a423e437711..3a29c0ac5d8a 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -1463,10 +1463,8 @@ static int sgtl5000_i2c_probe(struct i2c_client *client, /* read chip information */ ret = regmap_read(sgtl5000->regmap, SGTL5000_CHIP_ID, ®); - if (ret) { - ret = -EPROBE_DEFER; + if (ret) goto disable_clk; - } if (((reg & SGTL5000_PARTID_MASK) >> SGTL5000_PARTID_SHIFT) != SGTL5000_PARTID_PART_ID) { |