diff options
| author |   Axel Lin <axel.lin@ingics.com> | 2015-06-29 11:15:23 +0800 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2015-07-07 13:48:59 +0100 |
| commit | 93ec3a1ad5b86aef8ca90d2b149ded0f6bb689f5 (patch) | |
| tree | 7403030f98a0f435a7662aa5b5adb00bada97d1f /sound | |
| parent | Linux 4.2-rc1 (diff) | |
| download | linux-dev-93ec3a1ad5b86aef8ca90d2b149ded0f6bb689f5.tar.xz linux-dev-93ec3a1ad5b86aef8ca90d2b149ded0f6bb689f5.zip | |
ASoC: 88pm860x: Don't change pm860x->dir setting if pm860x_set_dai_sysclk fails
88pm860x does not support slave mode, so it returns -EINVAL for
PM860X_CLK_DIR_IN. Current code changes pm860x->dir setting before
return error, so it has impact on the logic of pm860x_pcm_set_dai_fmt.
This patch adds comment for the reason to return -EINVAL for
PM860X_CLK_DIR_IN, and avoid changing pm860x->dir setting if
pm860x_set_dai_sysclk fails.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/88pm860x-codec.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c index 38b3dad9d48a..4d91a6aa696b 100644 --- a/sound/soc/codecs/88pm860x-codec.c +++ b/sound/soc/codecs/88pm860x-codec.c @@ -1028,10 +1028,8 @@ static int pm860x_set_dai_sysclk(struct snd_soc_dai *codec_dai, if (dir == PM860X_CLK_DIR_OUT) pm860x->dir = PM860X_CLK_DIR_OUT; - else { - pm860x->dir = PM860X_CLK_DIR_IN; + else /* Slave mode is not supported */ return -EINVAL; - } return 0; } |