summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2016-08-24 16:24:15 -0700
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-01-10 23:10:02 +0100
commitf3d8abf3bc9b8a9d685d122a39fe47649d9a5e22 (patch)
treec3627bd2fb5e393c7876366528d8ef05c21b92f0 /sound
parentd3dfa192cc95e2d129a3e1c25993cc9531078b8b (diff)
Revert "sgtl5000.c: HACK, defer probe when I2C not yet running"
This reverts commit 150c9ee190ebd236f7693b82b9328d49440d0a33. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 438ef6415201803959394c6597a4c8ed012543de)
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/sgtl5000.c4
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, &reg);
- if (ret) {
- ret = -EPROBE_DEFER;
+ if (ret)
goto disable_clk;
- }
if (((reg & SGTL5000_PARTID_MASK) >> SGTL5000_PARTID_SHIFT) !=
SGTL5000_PARTID_PART_ID) {