diff options
| author |   Jing Xiangfeng <jingxiangfeng@huawei.com> | 2021-06-17 20:26:14 +0800 |
|---|---|---|
| committer |   Will Deacon <will@kernel.org> | 2021-06-17 19:45:24 +0100 |
| commit | d96b1b8c9f79b6bb234a31c80972a6f422079376 (patch) | |
| tree | 8b686b942170f7cac93d084986db2ebcba4deb3c /drivers/perf/fsl_imx8_ddr_perf.c | |
| parent | perf/arm-cmn: Fix invalid pointer when access dtc object sharing the same IRQ number (diff) | |
| download | linux-dev-d96b1b8c9f79b6bb234a31c80972a6f422079376.tar.xz linux-dev-d96b1b8c9f79b6bb234a31c80972a6f422079376.zip | |
drivers/perf: fix the missed ida_simple_remove() in ddr_perf_probe()
ddr_perf_probe() misses to call ida_simple_remove() in an error path.
Jump to cpuhp_state_err to fix it.
Signed-off-by: Jing Xiangfeng <jingxiangfeng@huawei.com>
Reviewed-by: Dong Aisheng <aisheng.dong@nxp.com>
Link: https://lore.kernel.org/r/20210617122614.166823-1-jingxiangfeng@huawei.com
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'drivers/perf/fsl_imx8_ddr_perf.c')
| -rw-r--r-- | drivers/perf/fsl_imx8_ddr_perf.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/perf/fsl_imx8_ddr_perf.c b/drivers/perf/fsl_imx8_ddr_perf.c index 2a1d78794a4e..94ebc1ecace7 100644 --- a/drivers/perf/fsl_imx8_ddr_perf.c +++ b/drivers/perf/fsl_imx8_ddr_perf.c @@ -702,8 +702,10 @@ static int ddr_perf_probe(struct platform_device *pdev) name = devm_kasprintf(&pdev->dev, GFP_KERNEL, DDR_PERF_DEV_NAME "%d", num); - if (!name) - return -ENOMEM; + if (!name) { + ret = -ENOMEM; + goto cpuhp_state_err; + } pmu->devtype_data = of_device_get_match_data(&pdev->dev); |