diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-23 19:25:18 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-23 19:25:18 +0100 |
| commit | 83097a9c677101645665ac7222e06ebd03a9e997 (patch) | |
| tree | 7e4eb8a7a19607c28ff75a35fb2bdec42121bb55 /sound/soc/soc-io.c | |
| parent | 60d509fa6a9c4653a86ad830e4c4b30360b23f0e (diff) | |
| parent | 60b6f1a1e578a5f8a245d4b7622ebf2bad7798cb (diff) | |
| download | linux-0-day-83097a9c677101645665ac7222e06ebd03a9e997.tar.gz linux-0-day-83097a9c677101645665ac7222e06ebd03a9e997.tar.xz | |
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'sound/soc/soc-io.c')
| -rw-r--r-- | sound/soc/soc-io.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c index 29183ef2b93d2..8ca9ecc5ac575 100644 --- a/sound/soc/soc-io.c +++ b/sound/soc/soc-io.c @@ -158,10 +158,7 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec, return -EINVAL; } - if (IS_ERR(codec->control_data)) - return PTR_ERR(codec->control_data); - - return 0; + return PTR_RET(codec->control_data); } EXPORT_SYMBOL_GPL(snd_soc_codec_set_cache_io); #else |