Merge remote-tracking branch 'asoc/fix/dwc' into asoc-next

1df63cc0 · Mark Brown · 8e37fcb6 · 0099d24c · 1df63cc0
Commit 1df63cc0 authored Feb 11, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

sound/soc/dwc/designware_i2s.c sound/soc/dwc/designware_i2s.c +4 -0

No files found.
--- 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);