Commit 1df63cc0 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 8e37fcb6 0099d24c

sound/soc/dwc/designware_i2s.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -210,15 +210,19 @@ static int dw_i2s_hw_params(struct snd_pcm_substream *substream, 
	switch (config->chan_nr) {

	switch (config->chan_nr) {

	case EIGHT_CHANNEL_SUPPORT:

	case EIGHT_CHANNEL_SUPPORT:

		ch_reg = 3;

		ch_reg = 3;

		break;

	case SIX_CHANNEL_SUPPORT:

	case SIX_CHANNEL_SUPPORT:

		ch_reg = 2;

		ch_reg = 2;

		break;

	case FOUR_CHANNEL_SUPPORT:

	case FOUR_CHANNEL_SUPPORT:

		ch_reg = 1;

		ch_reg = 1;

		break;

	case TWO_CHANNEL_SUPPORT:

	case TWO_CHANNEL_SUPPORT:

		ch_reg = 0;

		ch_reg = 0;

		break;

		break;

	default:

	default:

		dev_err(dev->dev, "channel not supported\n");

		dev_err(dev->dev, "channel not supported\n");

		return -EINVAL;

	}

	}





	i2s_disable_channels(dev, substream->stream);

	i2s_disable_channels(dev, substream->stream);