---

yaml --- r: 364742 b: refs/heads/master c: f4f5ba5 h: refs/heads/master v: v3
git-mirror · Mar 18, 2013 · 579b9f7 · 579b9f7
1 parent 544c8a5
commit 579b9f7
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: 4dbb71612505de1d3d69d011199554f86273c5e9
+refs/heads/master: f4f5ba5e7d9e087f044fe87f5a5421761274aa48
diff --git 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) {