diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-15 01:21:35 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-15 01:21:35 (GMT) |
commit | 2f093e2aa466d799c0952bfd1c6c68ff5d80fc17 (patch) | |
tree | e3d511aca536b7123d256b98a0ef8e74fc219498 /sound/soc/codecs/si476x.c | |
parent | a7761027656dc192b59617a6eb961e38097419ce (diff) | |
parent | 41ef2d5678d83af030125550329b6ae8b74618fa (diff) | |
download | linux-fsl-qoriq-2f093e2aa466d799c0952bfd1c6c68ff5d80fc17.tar.xz |
Merge 3.9-rc7 into char-misc-next
We want the fixes in there.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/soc/codecs/si476x.c')
-rw-r--r-- | sound/soc/codecs/si476x.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/si476x.c b/sound/soc/codecs/si476x.c index f2d61a1..566ea32 100644 --- a/sound/soc/codecs/si476x.c +++ b/sound/soc/codecs/si476x.c @@ -159,6 +159,7 @@ static int si476x_codec_hw_params(struct snd_pcm_substream *substream, switch (params_format(params)) { case SNDRV_PCM_FORMAT_S8: width = SI476X_PCM_FORMAT_S8; + break; case SNDRV_PCM_FORMAT_S16_LE: width = SI476X_PCM_FORMAT_S16_LE; break; |