From 579b9f77066bb142065f157e65a5158317795f56 Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@ti.com>
Date: Fri, 15 Mar 2013 10:56:19 +0200
Subject: [PATCH] --- yaml --- r: 364742 b: refs/heads/master c:
 f4f5ba5e7d9e087f044fe87f5a5421761274aa48 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/usb/gadget/s3c-hsotg.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 49d30a717676..82a5ef2b1403 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4dbb71612505de1d3d69d011199554f86273c5e9
+refs/heads/master: f4f5ba5e7d9e087f044fe87f5a5421761274aa48
diff --git a/trunk/drivers/usb/gadget/s3c-hsotg.c b/trunk/drivers/usb/gadget/s3c-hsotg.c
index f1ceabff7cce..a3cdc32115d5 100644
--- a/trunk/drivers/usb/gadget/s3c-hsotg.c
+++ b/trunk/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) {