diff options
| author | Peter Ujfalusi | 2014-01-30 14:15:24 +0100 |
|---|---|---|
| committer | Mark Brown | 2014-01-31 17:38:24 +0100 |
| commit | 0f7d9a635b7d1b120884b13d8763c9499e8a4aca (patch) | |
| tree | da11e27c85b231ad989c16aefec872d99f568377 | |
| parent | Merge branch 'fix/davinci' of git://git.kernel.org/pub/scm/linux/kernel/git/b... (diff) | |
| download | kernel-qcow2-linux-0f7d9a635b7d1b120884b13d8763c9499e8a4aca.tar.gz kernel-qcow2-linux-0f7d9a635b7d1b120884b13d8763c9499e8a4aca.tar.xz kernel-qcow2-linux-0f7d9a635b7d1b120884b13d8763c9499e8a4aca.zip | |
ASoC: davinci-mcasp: Return value handling cleanup for mcasp_common_hw_param()
Take the return value from mcasp_common_hw_param() and use that in case of
error.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
| -rw-r--r-- | sound/soc/davinci/davinci-mcasp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index f662ef22b8ae..f837b0a4f6f4 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -631,8 +631,10 @@ static int davinci_mcasp_hw_params(struct snd_pcm_substream *substream, active_serializers = (channels + slots - 1) / slots; - if (mcasp_common_hw_param(mcasp, substream->stream, channels) == -EINVAL) - return -EINVAL; + ret = mcasp_common_hw_param(mcasp, substream->stream, channels); + if (ret) + return ret; + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) fifo_level = mcasp->txnumevt * active_serializers; else |