From ad690f903f6324cee7eef6469dada2ba3e2310d6 Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Tue, 9 Oct 2012 11:56:40 +0200 Subject: [PATCH] --- yaml --- r: 342713 b: refs/heads/master c: 6b7fa011571d10309cd2b39511f895cef9dd536c h: refs/heads/master i: 342711: 99abae46f365aed60a46726572ccd2cd1cf7d6a5 v: v3 --- [refs] | 2 +- trunk/sound/soc/davinci/davinci-mcasp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8303bca86ba6..99df31cc0ff2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 21eb24d8d50a26fe6bd626bc9771a469e14907dc +refs/heads/master: 6b7fa011571d10309cd2b39511f895cef9dd536c diff --git a/trunk/sound/soc/davinci/davinci-mcasp.c b/trunk/sound/soc/davinci/davinci-mcasp.c index 05a2b1e6fd42..4fd149bb1ae7 100644 --- a/trunk/sound/soc/davinci/davinci-mcasp.c +++ b/trunk/sound/soc/davinci/davinci-mcasp.c @@ -867,12 +867,12 @@ static int davinci_mcasp_hw_params(struct snd_pcm_substream *substream, case SNDRV_PCM_FORMAT_U24_3LE: case SNDRV_PCM_FORMAT_S24_3LE: - case SNDRV_PCM_FORMAT_U24_LE: - case SNDRV_PCM_FORMAT_S24_LE: dma_params->data_type = 3; word_length = DAVINCI_AUDIO_WORD_24; break; + case SNDRV_PCM_FORMAT_U24_LE: + case SNDRV_PCM_FORMAT_S24_LE: case SNDRV_PCM_FORMAT_U32_LE: case SNDRV_PCM_FORMAT_S32_LE: dma_params->data_type = 4;