summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2014-06-10 05:35:56 +0200
committerMark Brown <broonie@linaro.org>2014-06-21 12:31:06 +0200
commit1657caf5d8c5f96528bb6b041028174ee2681681 (patch)
tree382a5fb59ea94cc52ff2838aee325294c79e3382 /sound/soc
parentLinux 3.16-rc1 (diff)
downloadlinux-1657caf5d8c5f96528bb6b041028174ee2681681.tar.xz
linux-1657caf5d8c5f96528bb6b041028174ee2681681.zip
ASoC: rt5640: Remove unneeded goto in rt5640_i2c_probe
Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/rt5640.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
index de80e89b5fd8..6bc6efdec550 100644
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
@@ -2215,14 +2215,8 @@ static int rt5640_i2c_probe(struct i2c_client *i2c,
rt5640->hp_mute = 1;
- ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5640,
- rt5640_dai, ARRAY_SIZE(rt5640_dai));
- if (ret < 0)
- goto err;
-
- return 0;
-err:
- return ret;
+ return snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5640,
+ rt5640_dai, ARRAY_SIZE(rt5640_dai));
}
static int rt5640_i2c_remove(struct i2c_client *i2c)