From a268dab612497039b2b3bd6fd00e00d46b44b64a Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@ti.com>
Date: Fri, 15 Mar 2013 11:05:03 +0200
Subject: [PATCH] --- yaml --- r: 364747 b: refs/heads/master c:
 9ee1c7fbeab5b671d3b63f2dd33ad48235efcfe8 h: refs/heads/master i:   364745:
 ee36c9bcbe041e5ff37916c659e91caade8cfbd4   364743:
 c74381d652a03cc7051ec144b5aeecfcc3d376d3 v: v3

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

diff --git a/[refs] b/[refs]
index 824bf671873d..1dc61fbdffa8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a16283e11d4443430b826c7b131a244e494ac53c
+refs/heads/master: 9ee1c7fbeab5b671d3b63f2dd33ad48235efcfe8
diff --git a/trunk/drivers/usb/host/ohci-exynos.c b/trunk/drivers/usb/host/ohci-exynos.c
index e3b7e85120e4..4b469e050208 100644
--- a/trunk/drivers/usb/host/ohci-exynos.c
+++ b/trunk/drivers/usb/host/ohci-exynos.c
@@ -128,7 +128,7 @@ static int exynos_ohci_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");