diff options
Diffstat (limited to 'target/linux/generic/patches-3.6/001-usb-host-ehci-platform-BUG_ON-to-WARN_ON-on-probe.patch')
-rw-r--r-- | target/linux/generic/patches-3.6/001-usb-host-ehci-platform-BUG_ON-to-WARN_ON-on-probe.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/target/linux/generic/patches-3.6/001-usb-host-ehci-platform-BUG_ON-to-WARN_ON-on-probe.patch b/target/linux/generic/patches-3.6/001-usb-host-ehci-platform-BUG_ON-to-WARN_ON-on-probe.patch deleted file mode 100644 index 88c678f2a8..0000000000 --- a/target/linux/generic/patches-3.6/001-usb-host-ehci-platform-BUG_ON-to-WARN_ON-on-probe.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 86e4cb35f2260374df4139c2352afe7fe247cb60 Mon Sep 17 00:00:00 2001 -From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> -Date: Mon, 6 Aug 2012 18:06:53 -0700 -Subject: [PATCH] usb: host: ehci-platform: BUG_ON() to WARN_ON() on probe - -Commit 86e4cb35f2260374df4139c2352afe7fe247cb60 upstream. - -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> ---- - drivers/usb/host/ehci-platform.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - ---- 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 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; |