From 753dfd23612dfb4b585b7814a94237987fdf3359 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Wed, 25 Jan 2017 14:02:48 +0000 Subject: [PATCH] usb: chipidea: msm: Fix return value check in ci_hdrc_msm_probe() In case of error, the function devm_ioremap_resource() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Fixes: 2fc305be364e ("usb: chipidea: msm: Mux over secondary phy at the right time") Signed-off-by: Wei Yongjun Reviewed-by: Stephen Boyd Signed-off-by: Peter Chen --- drivers/usb/chipidea/ci_hdrc_msm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c index f1ede7909f54..0bdfcdcbf7a5 100644 --- a/drivers/usb/chipidea/ci_hdrc_msm.c +++ b/drivers/usb/chipidea/ci_hdrc_msm.c @@ -218,8 +218,8 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 1); ci->base = devm_ioremap_resource(&pdev->dev, res); - if (!ci->base) - return -ENOMEM; + if (IS_ERR(ci->base)) + return PTR_ERR(ci->base); ci->rcdev.owner = THIS_MODULE; ci->rcdev.ops = &ci_hdrc_msm_reset_ops;