diff mbox

ASoC: topology: Fix setting of stream rates, rate_min and rate_max

Message ID 1455603146-6138-1-git-send-email-mengdong.lin@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

mengdong.lin@linux.intel.com Feb. 16, 2016, 6:12 a.m. UTC 
From: Mengdong Lin <mengdong.lin@linux.intel.com>

Directly set a stream's rates, rate_min and rate_max from the topology
info. Also define set_stream_info to wrap setting of the stream info.

Signed-off-by: Mengdong Lin <mengdong.lin@linux.intel.com>

Comments

Mark Brown Feb. 19, 2016, 4:16 p.m. UTC | #1 
On Tue, Feb 16, 2016 at 02:27:32PM +0800, kbuild test robot wrote:

>    sound/soc/soc-topology.c: In function 'set_stream_info':
> >> sound/soc/soc-topology.c:1588:1: warning: no return statement in function returning non-void [-Wreturn-type]
>     }
>     ^

This is a real bug that 0day has identified.
mengdong.lin@linux.intel.com Feb. 22, 2016, 8:31 a.m. UTC | #2 
On 02/20/2016 12:16 AM, Mark Brown wrote:
> On Tue, Feb 16, 2016 at 02:27:32PM +0800, kbuild test robot wrote:
>
>>     sound/soc/soc-topology.c: In function 'set_stream_info':
>>>> sound/soc/soc-topology.c:1588:1: warning: no return statement in function returning non-void [-Wreturn-type]
>>      }
>>      ^
>
> This is a real bug that 0day has identified.
>

I'm sorry for the bug. Fixed this in v2 patch.

Thanks
Mengdong
diff mbox

Patch

diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index 0eb01e8..2f7da32 100644
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -1575,6 +1575,18 @@  static int soc_tplg_dapm_complete(struct soc_tplg *tplg)
 	return 0;
 }
 
+static int set_stream_info(struct snd_soc_pcm_stream *stream,
+	struct snd_soc_tplg_stream_caps *caps)
+{
+	stream->stream_name = kstrdup(caps->name, GFP_KERNEL);
+	stream->channels_min = caps->channels_min;
+	stream->channels_max = caps->channels_max;
+	stream->rates = caps->rates;
+	stream->rate_min = caps->rate_min;
+	stream->rate_max = caps->rate_max;
+	stream->formats = caps->formats;
+}
+
 static int soc_tplg_dai_create(struct soc_tplg *tplg,
 	struct snd_soc_tplg_pcm *pcm)
 {
@@ -1593,25 +1605,13 @@  static int soc_tplg_dai_create(struct soc_tplg *tplg,
 	if (pcm->playback) {
 		stream = &dai_drv->playback;
 		caps = &pcm->caps[SND_SOC_TPLG_STREAM_PLAYBACK];
-
-		stream->stream_name = kstrdup(caps->name, GFP_KERNEL);
-		stream->channels_min = caps->channels_min;
-		stream->channels_max = caps->channels_max;
-		stream->rates = snd_pcm_rate_range_to_bits(caps->rate_min,
-							caps->rate_max);
-		stream->formats = caps->formats;
+		set_stream_info(stream, caps);
 	}
 
 	if (pcm->capture) {
 		stream = &dai_drv->capture;
 		caps = &pcm->caps[SND_SOC_TPLG_STREAM_CAPTURE];
-
-		stream->stream_name = kstrdup(caps->name, GFP_KERNEL);
-		stream->channels_min = caps->channels_min;
-		stream->channels_max = caps->channels_max;
-		stream->rates = snd_pcm_rate_range_to_bits(caps->rate_min,
-							caps->rate_max);
-		stream->formats = caps->formats;
+		set_stream_info(stream, caps);
 	}
 
 	/* pass control to component driver for optional further init */