---

yaml --- r: 364746 b: refs/heads/master c: a16283e h: refs/heads/master v: v3
git-mirror · Mar 18, 2013 · 81e4788 · 81e4788
1 parent ee36c9b
commit 81e4788
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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");