usb: phy: msm: Fix return value check in msm_otg_probe()
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Sun, 20 Jul 2014 03:40:37 +0000 (11:40 +0800)
committerFelipe Balbi <balbi@ti.com>
Tue, 19 Aug 2014 14:27:24 +0000 (09:27 -0500)
In case of error, the function devm_ioremap_nocache() 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 <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/phy/phy-msm-usb.c

index e4108ee..afc0908 100644 (file)
@@ -1601,8 +1601,8 @@ static int msm_otg_probe(struct platform_device *pdev)
         */
        if (motg->phy_number) {
                phy_select = devm_ioremap_nocache(&pdev->dev, USB2_PHY_SEL, 4);
-               if (IS_ERR(phy_select))
-                       return PTR_ERR(phy_select);
+               if (!phy_select)
+                       return -ENOMEM;
                /* Enable second PHY with the OTG port */
                writel(0x1, phy_select);
        }