bcm53xx: use backported versions of bcma USB patches

[15.05/openwrt.git] / target / linux / bcm53xx / patches-3.18 / 082-04-USB-bcma-fix-error-handling-in-bcma_hcd_create_pdev.patch

diff --git a/target/linux/bcm53xx/patches-3.18/082-04-USB-bcma-fix-error-handling-in-bcma_hcd_create_pdev.patch b/target/linux/bcm53xx/patches-3.18/082-04-USB-bcma-fix-error-handling-in-bcma_hcd_create_pdev.patch
new file mode 100644 (file)
index 0000000..8b4203e
--- /dev/null
+++ b/target/linux/bcm53xx/patches-3.18/082-04-USB-bcma-fix-error-handling-in-bcma_hcd_create_pdev.patch
@@ -0,0 +1,34 @@
+From ab2de5793080dfb9f191ca71068b9f476a55a0f4 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Thu, 11 Jun 2015 22:57:38 +0200
+Subject: [PATCH] USB: bcma: fix error handling in bcma_hcd_create_pdev()
+
+This patch makes bcma_hcd_create_pdev() not return NULL, but a prober
+error code in case of an error.
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/usb/host/bcma-hcd.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/usb/host/bcma-hcd.c
++++ b/drivers/usb/host/bcma-hcd.c
+@@ -169,7 +169,7 @@ static struct platform_device *bcma_hcd_
+ {
+       struct platform_device *hci_dev;
+       struct resource hci_res[2];
+-      int ret = -ENOMEM;
++      int ret;
+ 
+       memset(hci_res, 0, sizeof(hci_res));
+ 
+@@ -183,7 +183,7 @@ static struct platform_device *bcma_hcd_
+       hci_dev = platform_device_alloc(ohci ? "ohci-platform" :
+                                       "ehci-platform" , 0);
+       if (!hci_dev)
+-              return NULL;
++              return ERR_PTR(-ENOMEM);
+ 
+       hci_dev->dev.parent = &dev->dev;
+       hci_dev->dev.dma_mask = &hci_dev->dev.coherent_dma_mask;