From ac084033d0ca5d6bca24b455dd0f79943c725faf Mon Sep 17 00:00:00 2001 From: "Shimoda, Yoshihiro" Date: Tue, 12 Jun 2012 09:34:33 +0900 Subject: [PATCH] --- yaml --- r: 310921 b: refs/heads/master c: 5897b038296ea84e501ba5f957e11939f8cf9be0 h: refs/heads/master i: 310919: dfcf3d8f19ef6add34017feba47b4eca99d93a96 v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ehci-sh.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a7497bddb274..b41348d95e69 100644 --- 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 index ca819cdd0c5e..e7cb3925abf8 100644 --- 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,