| From 6890fb4256e46be8176bc72ab4cdd50d741c12e4 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 17 Jun 2021 20:26:14 +0800 |
| Subject: drivers/perf: fix the missed ida_simple_remove() in ddr_perf_probe() |
| |
| From: Jing Xiangfeng <jingxiangfeng@huawei.com> |
| |
| [ Upstream commit d96b1b8c9f79b6bb234a31c80972a6f422079376 ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/perf/fsl_imx8_ddr_perf.c | 6 ++++-- |
| 1 file changed, 4 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/perf/fsl_imx8_ddr_perf.c b/drivers/perf/fsl_imx8_ddr_perf.c |
| index 397540a4b799..7f7bc0993670 100644 |
| --- a/drivers/perf/fsl_imx8_ddr_perf.c |
| +++ b/drivers/perf/fsl_imx8_ddr_perf.c |
| @@ -623,8 +623,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); |
| |
| -- |
| 2.30.2 |
| |
