mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-07 19:30:30 +09:00
firmware: imx-dsp: Fix an error handling path in imx_dsp_setup_channels()
[ Upstream commite527adfb9b] If mbox_request_channel_byname() fails, the memory allocated a few lines above still need to be freed before going to the error handling path. Fixes:046326989a("firmware: imx: Save channel name for further use") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
1df81ea9e4
commit
be57fc50dc
@@ -115,6 +115,7 @@ static int imx_dsp_setup_channels(struct imx_dsp_ipc *dsp_ipc)
|
|||||||
dsp_chan->idx = i % 2;
|
dsp_chan->idx = i % 2;
|
||||||
dsp_chan->ch = mbox_request_channel_byname(cl, chan_name);
|
dsp_chan->ch = mbox_request_channel_byname(cl, chan_name);
|
||||||
if (IS_ERR(dsp_chan->ch)) {
|
if (IS_ERR(dsp_chan->ch)) {
|
||||||
|
kfree(dsp_chan->name);
|
||||||
ret = PTR_ERR(dsp_chan->ch);
|
ret = PTR_ERR(dsp_chan->ch);
|
||||||
if (ret != -EPROBE_DEFER)
|
if (ret != -EPROBE_DEFER)
|
||||||
dev_err(dev, "Failed to request mbox chan %s ret %d\n",
|
dev_err(dev, "Failed to request mbox chan %s ret %d\n",
|
||||||
|
|||||||
Reference in New Issue
Block a user