From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Tue, 7 Aug 2012 01:06:53 +0000 (-0700)
Subject: usb: host: ehci-platform: BUG_ON() to WARN_ON() on probe
X-Git-Tag: upstream/snapshot3+hdmi~6591^2~193
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=86e4cb35f2260374df4139c2352afe7fe247cb60;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

usb: host: ehci-platform: BUG_ON() to WARN_ON() on probe

usb_ehci_pdata is certainly required in ehci-platform driver.
This patch avoids using BUG_ON() from driver,
and return from probe with WARN_ON() if pdata was NULL.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c
index 4b1d896..a2aaef6 100644
--- a/drivers/usb/host/ehci-platform.c
+++ b/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;