diff options
| author | YueHaibing <yuehaibing@huawei.com> | 2020-09-05 20:25:03 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-30 11:53:48 +0100 |
| commit | 2fc6cdb1d67ef7ff68d861fbce745f3f2dc54673 (patch) | |
| tree | 624a391f28356851c95ed9511fba56bd752b3fcb /drivers/remoteproc | |
| parent | f1bf8c9f49adacb32584b1213b94a813ec565cf3 (diff) | |
| download | linux-stable-2fc6cdb1d67ef7ff68d861fbce745f3f2dc54673.tar.gz linux-stable-2fc6cdb1d67ef7ff68d861fbce745f3f2dc54673.tar.bz2 linux-stable-2fc6cdb1d67ef7ff68d861fbce745f3f2dc54673.zip | |
remoteproc: k3-dsp: Fix return value check in k3_dsp_rproc_of_get_memories()
[ Upstream commit 6dfdf6e4e7096fead7755d47d91d72e896bb4804 ]
In case of error, the function devm_ioremap_wc() returns NULL pointer
not ERR_PTR(). The IS_ERR() test in the return value check should be
replaced with NULL test.
Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Fixes: 6edbe024ba17 ("remoteproc: k3-dsp: Add a remoteproc driver of K3 C66x DSPs")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Acked-by: Suman Anna <s-anna@ti.com>
Link: https://lore.kernel.org/r/20200905122503.17352-1-yuehaibing@huawei.com
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/remoteproc')
| -rw-r--r-- | drivers/remoteproc/ti_k3_dsp_remoteproc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/remoteproc/ti_k3_dsp_remoteproc.c b/drivers/remoteproc/ti_k3_dsp_remoteproc.c index 9011e477290c..863c0214e0a8 100644 --- a/drivers/remoteproc/ti_k3_dsp_remoteproc.c +++ b/drivers/remoteproc/ti_k3_dsp_remoteproc.c @@ -445,10 +445,10 @@ static int k3_dsp_rproc_of_get_memories(struct platform_device *pdev, kproc->mem[i].cpu_addr = devm_ioremap_wc(dev, res->start, resource_size(res)); - if (IS_ERR(kproc->mem[i].cpu_addr)) { + if (!kproc->mem[i].cpu_addr) { dev_err(dev, "failed to map %s memory\n", data->mems[i].name); - return PTR_ERR(kproc->mem[i].cpu_addr); + return -ENOMEM; } kproc->mem[i].bus_addr = res->start; kproc->mem[i].dev_addr = data->mems[i].dev_addr; |