diff options
| author | Mark Brown <broonie@kernel.org> | 2015-06-19 13:17:19 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-06-19 13:17:19 +0300 |
| commit | 89a6192049050035cbd779d35686cbf29ca9184f (patch) | |
| tree | f63c3344dc7ce4da5589d043d6135c7ff81508fd /sound/soc/codecs/ssm4567.c | |
| parent | f9f55e31f8a537b7eaccc4fdb243cff938fa428c (diff) | |
| parent | cc76e7def0fa27b5f42aea54e34c96b4bddaf30a (diff) | |
| download | linux-89a6192049050035cbd779d35686cbf29ca9184f.tar.xz | |
Merge branches 'topic/adsp' and 'topic/dapm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-arizona
Diffstat (limited to 'sound/soc/codecs/ssm4567.c')
| -rw-r--r-- | sound/soc/codecs/ssm4567.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sound/soc/codecs/ssm4567.c b/sound/soc/codecs/ssm4567.c index a984485108cd..643bcff4a919 100644 --- a/sound/soc/codecs/ssm4567.c +++ b/sound/soc/codecs/ssm4567.c @@ -361,12 +361,7 @@ static int ssm4567_set_bias_level(struct snd_soc_codec *codec, break; } - if (ret) - return ret; - - codec->dapm.bias_level = level; - - return 0; + return ret; } static const struct snd_soc_dai_ops ssm4567_dai_ops = { |