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;