Commit b6dd245c authored Aug 06, 2012 by Kuninori Morimoto Committed by Greg Kroah-Hartman Aug 10, 2012

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



usb_ohci_pdata is certainly required in ohci-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>

parent 86e4cb35

drivers/usb/host/ohci-platform.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -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;