From: Felipe Balbi <balbi@ti.com>
Date: Fri, 15 Mar 2013 09:04:15 +0000 (+0200)
Subject: usb: host: ehci-s5p: fix PHY error handling
X-Git-Tag: v3.10-rc1~190^2~63^2~80
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=a16283e11d4443430b826c7b131a244e494ac53c;p=~andy%2Flinux

usb: host: ehci-s5p: fix PHY error handling

PHY layer no longer returns NULL. We must
switch from IS_ERR_OR_NULL() to IS_ERR().

Signed-off-by: Felipe Balbi <balbi@ti.com>
---

diff --git a/drivers/usb/host/ehci-s5p.c b/drivers/usb/host/ehci-s5p.c
index 20ebf6a8b7f..867a92390ef 100644
--- a/drivers/usb/host/ehci-s5p.c
+++ b/drivers/usb/host/ehci-s5p.c
@@ -139,7 +139,7 @@ static int s5p_ehci_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	phy = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
-	if (IS_ERR_OR_NULL(phy)) {
+	if (IS_ERR(phy)) {
 		/* Fallback to pdata */
 		if (!pdata) {
 			dev_warn(&pdev->dev, "no platform data or transceiver defined\n");