Merge tag 'denywrite-for-5.15' of git://github.com/davidhildenbrand/linux

[linux-2.6-microblaze.git] / sound / soc / soc-dai.c

diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c
index a56dcc8..3db0fcf 100644 (file)
--- a/sound/soc/soc-dai.c
+++ b/sound/soc/soc-dai.c
@@ -492,18 +492,16 @@ bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int dir)
  */
 void snd_soc_dai_link_set_capabilities(struct snd_soc_dai_link *dai_link)
 {
-       struct snd_soc_dai_link_component *cpu;
-       struct snd_soc_dai_link_component *codec;
-       struct snd_soc_dai *dai;
        bool supported[SNDRV_PCM_STREAM_LAST + 1];
-       bool supported_cpu;
-       bool supported_codec;
        int direction;
-       int i;
 
        for_each_pcm_streams(direction) {
-               supported_cpu = false;
-               supported_codec = false;
+               struct snd_soc_dai_link_component *cpu;
+               struct snd_soc_dai_link_component *codec;
+               struct snd_soc_dai *dai;
+               bool supported_cpu = false;
+               bool supported_codec = false;
+               int i;
 
                for_each_link_cpus(dai_link, i, cpu) {
                        dai = snd_soc_find_dai_with_mutex(cpu);
@@ -597,11 +595,11 @@ int snd_soc_pcm_dai_remove(struct snd_soc_pcm_runtime *rtd, int order)
 int snd_soc_pcm_dai_new(struct snd_soc_pcm_runtime *rtd)
 {
        struct snd_soc_dai *dai;
-       int i, ret = 0;
+       int i;
 
        for_each_rtd_dais(rtd, i, dai) {
                if (dai->driver->pcm_new) {
-                       ret = dai->driver->pcm_new(rtd, dai);
+                       int ret = dai->driver->pcm_new(rtd, dai);
                        if (ret < 0)
                                return soc_dai_ret(dai, ret);
                }