diff options
| author | Takashi Iwai <tiwai@suse.de> | 2020-09-11 19:26:04 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-09-11 19:26:04 +0300 |
| commit | 8949b6660c3c7947a9b696c97eb85a32abe4a2d7 (patch) | |
| tree | d4593b3d4624b0fbceb22a38e26465bca1711d5a /sound/soc/qcom/common.c | |
| parent | fc19d559b0d31b5b831fd468b10d7dadafc0d0ec (diff) | |
| parent | 1a5ce48fd667128e369fdc7fb87e21539aed21b5 (diff) | |
| download | linux-8949b6660c3c7947a9b696c97eb85a32abe4a2d7.tar.xz | |
Merge tag 'asoc-fix-v5.9-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.9
Most of this is various driver specific fixes, none of which are
terribly exciting in themselves, plus one core fix adding and using a
new DAI lookup function to deal with a lockdep warning.
Diffstat (limited to 'sound/soc/qcom/common.c')
| -rw-r--r-- | sound/soc/qcom/common.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/qcom/common.c b/sound/soc/qcom/common.c index 5194d90ddb96..fd69cf8b1f23 100644 --- a/sound/soc/qcom/common.c +++ b/sound/soc/qcom/common.c @@ -52,8 +52,10 @@ int qcom_snd_parse_of(struct snd_soc_card *card) for_each_child_of_node(dev->of_node, np) { dlc = devm_kzalloc(dev, 2 * sizeof(*dlc), GFP_KERNEL); - if (!dlc) - return -ENOMEM; + if (!dlc) { + ret = -ENOMEM; + goto err; + } link->cpus = &dlc[0]; link->platforms = &dlc[1]; |