1 files changed, 6 insertions, 1 deletions

diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c
index 1c1f2210387b..d2663e79ece1 100644
--- a/sound/soc/bcm/bcm2835-i2s.c
+++ b/sound/soc/bcm/bcm2835-i2s.c
@@ -259,6 +259,9 @@ static int bcm2835_i2s_hw_params(struct snd_pcm_substream *substream,
         case SNDRV_PCM_FORMAT_S16_LE:
                 data_length = 16;
                 break;
+        case SNDRV_PCM_FORMAT_S24_LE:
+                data_length = 24;
+                break;
         case SNDRV_PCM_FORMAT_S32_LE:
                 data_length = 32;
                 break;
@@ -279,7 +282,7 @@ static int bcm2835_i2s_hw_params(struct snd_pcm_substream *substream,
         /* Setup the frame format */
         format = BCM2835_I2S_CHEN;
 
-        if (data_length > 24)
+        if (data_length >= 24)
                 format |= BCM2835_I2S_CHWEX;
 
         format |= BCM2835_I2S_CHWID((data_length-8)&0xf);
@@ -570,6 +573,7 @@ static struct snd_soc_dai_driver bcm2835_i2s_dai = {
                 .channels_max = 2,
                 .rates =        SNDRV_PCM_RATE_8000_192000,
                 .formats =      SNDRV_PCM_FMTBIT_S16_LE
+                                | SNDRV_PCM_FMTBIT_S24_LE
                                 | SNDRV_PCM_FMTBIT_S32_LE
                 },
         .capture = {
@@ -577,6 +581,7 @@ static struct snd_soc_dai_driver bcm2835_i2s_dai = {
                 .channels_max = 2,
                 .rates =        SNDRV_PCM_RATE_8000_192000,
                 .formats =      SNDRV_PCM_FMTBIT_S16_LE
+                                | SNDRV_PCM_FMTBIT_S24_LE
                                 | SNDRV_PCM_FMTBIT_S32_LE
                 },
         .ops = &bcm2835_i2s_dai_ops,