[PATCH linux dev-5.2 1/5] mmc: sdhci-of-aspeed: Fix return value check in aspeed_sdc_probe()
Andrew Jeffery
andrew at aj.id.au
Fri Aug 30 18:56:28 AEST 2019
From: Wei Yongjun <weiyongjun1 at huawei.com>
In case of error, the function of_platform_device_create() returns
NULL pointer not ERR_PTR(). The IS_ERR() test in the return value
check should be replaced with NULL test.
Signed-off-by: Wei Yongjun <weiyongjun1 at huawei.com>
Reviewed-by: Andrew Jeffery <andrew at aj.id.au>
Signed-off-by: Ulf Hansson <ulf.hansson at linaro.org>
(cherry picked from commit 7b7de08a14b59d45cc4720bfb21732063ccfc8f6)
Signed-off-by: Andrew Jeffery <andrew at aj.id.au>
---
drivers/mmc/host/sdhci-of-aspeed.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/host/sdhci-of-aspeed.c b/drivers/mmc/host/sdhci-of-aspeed.c
index 8bb095ca2fa9..d5acb5afc50f 100644
--- a/drivers/mmc/host/sdhci-of-aspeed.c
+++ b/drivers/mmc/host/sdhci-of-aspeed.c
@@ -261,9 +261,9 @@ static int aspeed_sdc_probe(struct platform_device *pdev)
struct platform_device *cpdev;
cpdev = of_platform_device_create(child, NULL, &pdev->dev);
- if (IS_ERR(cpdev)) {
+ if (!cpdev) {
of_node_put(child);
- ret = PTR_ERR(cpdev);
+ ret = -ENODEV;
goto err_clk;
}
}
--
2.20.1
More information about the openbmc
mailing list