diff --git a/[refs] b/[refs]
index a389faba7aee..7df76597bdd5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86e4cb35f2260374df4139c2352afe7fe247cb60
+refs/heads/master: b6dd245c4594482d46507a0bfd100439be367952
diff --git a/trunk/drivers/usb/host/ohci-platform.c b/trunk/drivers/usb/host/ohci-platform.c
index 670c7059c9ae..4c886f938f6c 100644
--- a/trunk/drivers/usb/host/ohci-platform.c
+++ b/trunk/drivers/usb/host/ohci-platform.c
@@ -83,10 +83,14 @@ static int __devinit ohci_platform_probe(struct platform_device *dev)
 {
 	struct usb_hcd *hcd;
 	struct resource *res_mem;
+	struct usb_ohci_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;