Skip to contentSkip to conversation

ASoC: dwc: fix support for more than two channels

PATCH Applied Dan Carpenter 3 participants 3 messages Jan 25, 2013 – Jan 26, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: dwc: fix support for more than two channels

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]

---
Static analysis. Untested.

sound/soc/dwc/designware_i2s.c +4 -0
index 1aa5130..deb30d5 100644
@@ -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);
#1 lore raw
Quoted 5 lines · Dan Carpenter

here were missing break statements so everything used TWO_CHANNEL_SUPPORT.

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

Quoted 8 lines

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]

---
Static analysis. Untested.

Acked By: Rajeev Kumar <[email protected]>
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel