diff options
author | Stephen Boyd <sboyd@kernel.org> | 2022-03-15 22:06:06 +0100 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2022-03-15 22:06:06 +0100 |
commit | 99105cc81885e1278c927cdff15a3fdef5c29289 (patch) | |
tree | c48ea12335dc9006df715a05433f3f19a3570ff7 /sound/soc/codecs/cpcap.c | |
parent | clk: ti: Update component clocks to use ti_dt_clk_name() (diff) | |
parent | Linux 5.17-rc4 (diff) | |
download | linux-99105cc81885e1278c927cdff15a3fdef5c29289.tar.xz linux-99105cc81885e1278c927cdff15a3fdef5c29289.zip |
Merge tag 'v5.17-rc4' into clk-ti
We want to get commit 31aa7056bbec ("ARM: dts: Don't use legacy clock
defines for dra7 clkctrl") so merge in the nearest rc.
Diffstat (limited to 'sound/soc/codecs/cpcap.c')
-rw-r--r-- | sound/soc/codecs/cpcap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/cpcap.c b/sound/soc/codecs/cpcap.c index 598e09024e23..ffdf8b615efa 100644 --- a/sound/soc/codecs/cpcap.c +++ b/sound/soc/codecs/cpcap.c @@ -1667,6 +1667,8 @@ static int cpcap_codec_probe(struct platform_device *pdev) { struct device_node *codec_node = of_get_child_by_name(pdev->dev.parent->of_node, "audio-codec"); + if (!codec_node) + return -ENODEV; pdev->dev.of_node = codec_node; |