[patch] ASoC: dwc: fix support for more than two channels

[patch] ASoC: dwc: fix support for more than two channels

[Dan Carpenter]

There were missing break statements so everything used
TWO_CHANNEL_SUPPORT.

Also I added a return statement to silence a GCC warning:

	sound/soc/dwc/designware_i2s.c: In function ‘dw_i2s_hw_params’:
	sound/soc/dwc/designware_i2s.c:236:32: warning: ‘ch_reg’ may be
		used uninitialized in this function
		[-Wmaybe-uninitialized]

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
Static analysis.  Untested.

diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s.c
index 1aa5130..deb30d5 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);
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [patch] ASoC: dwc: fix support for more than two channels

[Rajeev kumar]

On 1/25/2013 12:13 PM, Dan Carpenter wrote:
> here were missing break statements so everything used
> TWO_CHANNEL_SUPPORT.
>
> Also I added a return statement to silence a GCC warning:
>
> 	sound/soc/dwc/designware_i2s.c: In function ‘dw_i2s_hw_params’:
> 	sound/soc/dwc/designware_i2s.c:236:32: warning: ‘ch_reg’ may be
> 		used uninitialized in this function
> 		[-Wmaybe-uninitialized]
>
> Signed-off-by: Dan Carpenter<dan.carpenter@oracle.com>
> ---
> Static analysis.  Untested.

Acked By: Rajeev Kumar <rajeev-dlh.kumar@st.com>
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [patch] ASoC: dwc: fix support for more than two channels

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 161 bytes --]

On Fri, Jan 25, 2013 at 09:43:43AM +0300, Dan Carpenter wrote:
> There were missing break statements so everything used
> TWO_CHANNEL_SUPPORT.

Applied, thanks.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]