aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2015-01-13 20:10:00 -0500
committerKishon Vijay Abraham I <kishon@ti.com>2015-01-21 04:53:06 -0500
commit147fd9d6bbb6b4bf1c320089494c0cb1bf1636a2 (patch)
tree5e066fe2fbbaac34aab8a90a8cd35848e960e7de
parent7f33912d2978796662473f1f5e1fcfc387717e15 (diff)
phy: fix return value check in armada375_usb_phy_probe()
In case of error, the function devm_ioremap_resource() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
-rw-r--r--drivers/phy/phy-armada375-usb2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/phy/phy-armada375-usb2.c b/drivers/phy/phy-armada375-usb2.c
index ac7d99d01cb3..7c99ca256f05 100644
--- a/drivers/phy/phy-armada375-usb2.c
+++ b/drivers/phy/phy-armada375-usb2.c
@@ -118,8 +118,8 @@ static int armada375_usb_phy_probe(struct platform_device *pdev)
118 118
119 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 119 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
120 usb_cluster_base = devm_ioremap_resource(&pdev->dev, res); 120 usb_cluster_base = devm_ioremap_resource(&pdev->dev, res);
121 if (!usb_cluster_base) 121 if (IS_ERR(usb_cluster_base))
122 return -ENOMEM; 122 return PTR_ERR(usb_cluster_base);
123 123
124 phy = devm_phy_create(dev, NULL, &armada375_usb_phy_ops); 124 phy = devm_phy_create(dev, NULL, &armada375_usb_phy_ops);
125 if (IS_ERR(phy)) { 125 if (IS_ERR(phy)) {