kernel: update 3.18 to 3.18.16
[15.05/openwrt.git] / target / linux / bcm53xx / patches-3.18 / 183-USB-bcma-fix-error-handling-in-bcma_hcd_create_pdev.patch
1 From 232996d1ba3002e7e80b18075e2838fc86f21412 Mon Sep 17 00:00:00 2001
2 From: Hauke Mehrtens <hauke@hauke-m.de>
3 Date: Thu, 11 Jun 2015 22:57:38 +0200
4 Subject: [PATCH] USB: bcma: fix error handling in bcma_hcd_create_pdev()
5
6 This patch makes bcma_hcd_create_pdev() not return NULL, but a prober
7 error code in case of an error.
8
9 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
10 ---
11  drivers/usb/host/bcma-hcd.c | 4 ++--
12  1 file changed, 2 insertions(+), 2 deletions(-)
13
14 --- a/drivers/usb/host/bcma-hcd.c
15 +++ b/drivers/usb/host/bcma-hcd.c
16 @@ -169,7 +169,7 @@ static struct platform_device *bcma_hcd_
17  {
18         struct platform_device *hci_dev;
19         struct resource hci_res[2];
20 -       int ret = -ENOMEM;
21 +       int ret;
22  
23         memset(hci_res, 0, sizeof(hci_res));
24  
25 @@ -183,7 +183,7 @@ static struct platform_device *bcma_hcd_
26         hci_dev = platform_device_alloc(ohci ? "ohci-platform" :
27                                         "ehci-platform" , 0);
28         if (!hci_dev)
29 -               return NULL;
30 +               return ERR_PTR(-ENOMEM);
31  
32         hci_dev->dev.parent = &dev->dev;
33         hci_dev->dev.dma_mask = &hci_dev->dev.coherent_dma_mask;