From: Felipe Balbi <balbi@ti.com>
Date: Fri, 15 Mar 2013 08:56:19 +0000 (+0200)
Subject: usb: gadget: s3c-hsotg: fix PHY error handling
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f4f5ba5e7d9e087f044fe87f5a5421761274aa48;p=linux-beck.git

usb: gadget: s3c-hsotg: fix PHY error handling

PHY laye rno longer return NULL. We need to
switch over from IS_ERR_OR_NULL() to IS_ERR().

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

diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c
index f1ceabff7cce..a3cdc32115d5 100644
--- a/drivers/usb/gadget/s3c-hsotg.c
+++ b/drivers/usb/gadget/s3c-hsotg.c
@@ -3467,7 +3467,7 @@ static int s3c_hsotg_probe(struct platform_device *pdev)
 	}
 
 	phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);
-	if (IS_ERR_OR_NULL(phy)) {
+	if (IS_ERR(phy)) {
 		/* Fallback for pdata */
 		plat = pdev->dev.platform_data;
 		if (!plat) {