diff options
| author | Mark Brown | 2020-05-12 16:12:47 +0100 |
|---|---|---|
| committer | Mark Brown | 2020-05-12 16:12:47 +0100 |
| commit | 132a0eb0324025bb4691ee590996dbe302159298 (patch) | |
| tree | e70fcc3c1294f36f184f17b46bd82131cf71b686 /sound/soc/ti | |
| parent | 66c705d07d784fb6b4622c6e47b6acae357472db (diff) | |
| parent | 74fcfde748b26c68a8ab2791d9d73f698f7752d1 (diff) | |
Merge branch 'for-5.7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.8
Diffstat (limited to 'sound/soc/ti')
| -rw-r--r-- | sound/soc/ti/davinci-mcasp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c index 734ffe925c4d..7a7db743dc5b 100644 --- a/sound/soc/ti/davinci-mcasp.c +++ b/sound/soc/ti/davinci-mcasp.c @@ -1896,8 +1896,10 @@ static int davinci_mcasp_get_dma_type(struct davinci_mcasp *mcasp) PTR_ERR(chan)); return PTR_ERR(chan); } - if (WARN_ON(!chan->device || !chan->device->dev)) + if (WARN_ON(!chan->device || !chan->device->dev)) { + dma_release_channel(chan); return -EINVAL; + } if (chan->device->dev->of_node) ret = of_property_read_string(chan->device->dev->of_node, |