diff --git a/[refs] b/[refs]
index 984eb1390ea7..a389faba7aee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6df471ea04bd65603b67d821f2df359cc2cfac68
+refs/heads/master: 86e4cb35f2260374df4139c2352afe7fe247cb60
diff --git a/trunk/drivers/usb/host/ehci-platform.c b/trunk/drivers/usb/host/ehci-platform.c
index 4b1d896d5a22..a2aaef618aea 100644
--- a/trunk/drivers/usb/host/ehci-platform.c
+++ b/trunk/drivers/usb/host/ehci-platform.c
@@ -82,10 +82,14 @@ static int __devinit ehci_platform_probe(struct platform_device *dev)
 {
 	struct usb_hcd *hcd;
 	struct resource *res_mem;
+	struct usb_ehci_pdata *pdata = dev->dev.platform_data;
 	int irq;
 	int err = -ENOMEM;
 
-	BUG_ON(!dev->dev.platform_data);
+	if (!pdata) {
+		WARN_ON(1);
+		return -ENODEV;
+	}
 
 	if (usb_disabled())
 		return -ENODEV;