From 81e478855d1321463cdaab08c84aa573b3aa6437 Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@ti.com>
Date: Fri, 15 Mar 2013 11:04:15 +0200
Subject: [PATCH] --- yaml --- r: 364746 b: refs/heads/master c:
 a16283e11d4443430b826c7b131a244e494ac53c h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/usb/host/ehci-s5p.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 483548d9ec0b..824bf671873d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f3ed4ec182d191d1ba48fbf5aed021d2d00dd37
+refs/heads/master: a16283e11d4443430b826c7b131a244e494ac53c
diff --git a/trunk/drivers/usb/host/ehci-s5p.c b/trunk/drivers/usb/host/ehci-s5p.c
index 20ebf6a8b7f4..867a92390ef9 100644
--- a/trunk/drivers/usb/host/ehci-s5p.c
+++ b/trunk/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");