diff options
| author |   Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2014-07-20 11:40:37 +0800 |
|---|---|---|
| committer |   Felipe Balbi <balbi@ti.com> | 2014-08-19 09:27:24 -0500 |
| commit | 716d28e2e26d6640c4a516740b94a745f3f9ab33 (patch) | |
| tree | a42e0bafdc25e0732c3a847b9f97cb0287ecb3b7 /drivers/usb/phy | |
| parent | usb: gadget: Fix return value check in r8a66597_probe() (diff) | |
| download | linux-dev-716d28e2e26d6640c4a516740b94a745f3f9ab33.tar.xz linux-dev-716d28e2e26d6640c4a516740b94a745f3f9ab33.zip | |
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>
Diffstat (limited to 'drivers/usb/phy')
| -rw-r--r-- | drivers/usb/phy/phy-msm-usb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c index e4108eec5ef4..afc09087ec36 100644 --- a/drivers/usb/phy/phy-msm-usb.c +++ b/drivers/usb/phy/phy-msm-usb.c @@ -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); } |