Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 716d28e2 authored by Wei Yongjun's avatar Wei Yongjun Committed by Felipe Balbi
Browse files

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: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 4b11f888

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -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))

		if (!phy_select)

			return PTR_ERR(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);

	}

	}