summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2019-07-10 16:59:55 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-08-29 08:29:44 +0200
commitc9479b9717c301c7e495082a10f4ade47bf4f702 (patch)
tree06c294ea1b50c06c42213e04b8151139265c14c9 /include
parentf7d5b3dc4792a5fe0a4d6b8106a8f3eb20c3c24c (diff)
downloadlinux-stable-c9479b9717c301c7e495082a10f4ade47bf4f702.tar.gz
linux-stable-c9479b9717c301c7e495082a10f4ade47bf4f702.tar.bz2
linux-stable-c9479b9717c301c7e495082a10f4ade47bf4f702.zip
ASoC: simple_card_utils.h: care NULL dai at asoc_simple_debug_dai()
[ 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>
Diffstat (limited to 'include')
-rw-r--r--include/sound/simple_card_utils.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h
index 3429888347e7..b3609e4c46e0 100644
--- a/include/sound/simple_card_utils.h
+++ b/include/sound/simple_card_utils.h
@@ -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);