浏览代码

usb: phy: msm: Fix return value check in msm_otg_probe()

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>
Wei Yongjun 11 年之前
父节点
当前提交
716d28e2e2
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      drivers/usb/phy/phy-msm-usb.c

+ 2 - 2
drivers/usb/phy/phy-msm-usb.c

@@ -1601,8 +1601,8 @@ static int msm_otg_probe(struct platform_device *pdev)
 	 */
 	 */
 	if (motg->phy_number) {
 	if (motg->phy_number) {
 		phy_select = devm_ioremap_nocache(&pdev->dev, USB2_PHY_SEL, 4);
 		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 */
 		/* Enable second PHY with the OTG port */
 		writel(0x1, phy_select);
 		writel(0x1, phy_select);
 	}
 	}