diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:17 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:17 +0000 |
| commit | 1df63cc0f0eaa37d102cfccd617a21643ee56cb7 (patch) | |
| tree | e1e63d8d90ba8796e5a14bc734125f33c234dbc3 | |
| parent | 8e37fcb624c7b7d9231393661421e58cbf3aa760 (diff) | |
| parent | 0099d24c6bb584d3bac76ca81bb55f3fd8ddfb21 (diff) | |
| download | linux-1df63cc0f0eaa37d102cfccd617a21643ee56cb7.tar.bz2 | |
Merge remote-tracking branch 'asoc/fix/dwc' into asoc-next
| -rw-r--r-- | sound/soc/dwc/designware_i2s.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s.c index 1aa51300c564..deb30d59965e 100644 --- a/sound/soc/dwc/designware_i2s.c +++ b/sound/soc/dwc/designware_i2s.c @@ -210,15 +210,19 @@ static int dw_i2s_hw_params(struct snd_pcm_substream *substream, switch (config->chan_nr) { case EIGHT_CHANNEL_SUPPORT: ch_reg = 3; + break; case SIX_CHANNEL_SUPPORT: ch_reg = 2; + break; case FOUR_CHANNEL_SUPPORT: ch_reg = 1; + break; case TWO_CHANNEL_SUPPORT: ch_reg = 0; break; default: dev_err(dev->dev, "channel not supported\n"); + return -EINVAL; } i2s_disable_channels(dev, substream->stream); |