ASoC: soc-compress: Change the check for codec_dai

BugLink: https://bugs.launchpad.net/bugs/1969110
commit ccb4214f7f2a8b75acf493f31128e464ee1a3536 upstream.

It should be better to reverse the check on codec_dai
and returned early in order to be easier to understand.

Fixes: de2c6f98817f ("ASoC: soc-compress: prevent the potentially use of null pointer")
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220310030041.1556323-1-jiasheng@iscas.ac.cn
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 63351e2e13625435843f901c8aa14751e09b6f45)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index b3c64f87e054c33097100d011173f65ad00fb8d1..2050728063a150a34823e8e9650935994e1bf5c9 100644 (file)
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -534,16 +534,19 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)
                return -EINVAL;
        }
 
-       /* check client and interface hw capabilities */
-       if (codec_dai) {
-               if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_PLAYBACK) &&
-                   snd_soc_dai_stream_valid(cpu_dai,   SNDRV_PCM_STREAM_PLAYBACK))
-                       playback = 1;
-               if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_CAPTURE) &&
-                   snd_soc_dai_stream_valid(cpu_dai,   SNDRV_PCM_STREAM_CAPTURE))
-                       capture = 1;
+       if (!codec_dai) {
+               dev_err(rtd->card->dev, "Missing codec\n");
+               return -EINVAL;
        }
 
+       /* check client and interface hw capabilities */
+       if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_PLAYBACK) &&
+           snd_soc_dai_stream_valid(cpu_dai,   SNDRV_PCM_STREAM_PLAYBACK))
+               playback = 1;
+       if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_CAPTURE) &&
+           snd_soc_dai_stream_valid(cpu_dai,   SNDRV_PCM_STREAM_CAPTURE))
+               capture = 1;
+
        /*
         * Compress devices are unidirectional so only one of the directions
         * should be set, check for that (xor)