openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Wei Yongjun 2014-07-20 11:40:37 +08:00 committed by Felipe Balbi
parent 4b11f88821
commit 716d28e2e2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/usb/phy/phy-msm-usb.c
View File

@ -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);
} }