---

yaml --- r: 310921 b: refs/heads/master c: 5897b03 h: refs/heads/master i: 310919: dfcf3d8 v: v3
git-mirror · Jun 15, 2012 · ac08403 · ac08403
1 parent 364d70c
commit ac08403
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c4707f3f8c44ec18282e1c014c80e1c257042f9
+refs/heads/master: 5897b038296ea84e501ba5f957e11939f8cf9be0
diff --git a/trunk/drivers/usb/host/ehci-sh.c b/trunk/drivers/usb/host/ehci-sh.c
@@ -126,8 +126,7 @@ static int ehci_hcd_sh_probe(struct platform_device *pdev)
 		goto fail_create_hcd;
 	}
 
-	if (pdev->dev.platform_data != NULL)
-		pdata = pdev->dev.platform_data;
+	pdata = pdev->dev.platform_data;
 
 	/* initialize hcd */
 	hcd = usb_create_hcd(&ehci_sh_hc_driver, &pdev->dev,