diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-02-13 08:30:07 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-02-13 08:30:07 +0100 |
| commit | e2d6f8a5f596b1f09839990b11a3c2e0c9f0dbc2 (patch) | |
| tree | 7ccf35788cbb9def996204399f079366da251361 /sound/soc/amd/acp-pcm-dma.c | |
| parent | fed0764fafd8e2e629a033c0f7df4106b0dcb7f0 (diff) | |
| parent | 0cbb0b92689a1c4e0ac55f6188be563a813ac808 (diff) | |
Merge branch 'linus' into locking/core, to resolve conflicts
Conflicts:
kernel/locking/lockdep.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'sound/soc/amd/acp-pcm-dma.c')
| -rw-r--r-- | sound/soc/amd/acp-pcm-dma.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/amd/acp-pcm-dma.c b/sound/soc/amd/acp-pcm-dma.c index 3191e0a7d273..d1fb035f44db 100644 --- a/sound/soc/amd/acp-pcm-dma.c +++ b/sound/soc/amd/acp-pcm-dma.c @@ -635,6 +635,7 @@ static int acp_dma_open(struct snd_pcm_substream *substream) SNDRV_PCM_HW_PARAM_PERIODS); if (ret < 0) { dev_err(prtd->platform->dev, "set integer constraint failed\n"); + kfree(adata); return ret; } |