]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
ASoC: simple_card_utils.h: care NULL dai at asoc_simple_debug_dai()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Wed, 10 Jul 2019 07:59:55 +0000 (16:59 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 29 Aug 2019 06:29:44 +0000 (08:29 +0200)
[ Upstream commit 52db6685932e326ed607644ab7ebdae8c194adda ]

props->xxx_dai might be NULL when DPCM.
This patch cares it for debug.

Fixes: commit 0580dde59438 ("ASoC: simple-card-utils: add asoc_simple_debug_info()")
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87o922gw4u.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
include/sound/simple_card_utils.h

index 3429888347e7c21110182b4b2f4dd3e7c3e32a42..b3609e4c46e0f342d611cb8c0bd2daf7d3a94406 100644 (file)
@@ -149,6 +149,10 @@ inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv,
 {
        struct device *dev = simple_priv_to_dev(priv);
 
+       /* dai might be NULL */
+       if (!dai)
+               return;
+
        if (dai->name)
                dev_dbg(dev, "%s dai name = %s\n",
                        name, dai->name);