diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-06-06 15:53:03 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-08 17:26:22 -0400 |
commit | 87997195e341f2ca175e793460a66f5170f76921 (patch) | |
tree | e434f85b9ab81c5fcfa983ca0afbb57a3bd75df1 /drivers/usb | |
parent | e3e64f3f99d9e70973fb1ae7d02825fe2bb9eef2 (diff) |
USB: ssb: fix error handling in ssb_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>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/host/ssb-hcd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/ssb-hcd.c b/drivers/usb/host/ssb-hcd.c index ffc32f4b1b1b..623cb0ba4160 100644 --- a/drivers/usb/host/ssb-hcd.c +++ b/drivers/usb/host/ssb-hcd.c | |||
@@ -105,7 +105,7 @@ static struct platform_device *ssb_hcd_create_pdev(struct ssb_device *dev, bool | |||
105 | { | 105 | { |
106 | struct platform_device *hci_dev; | 106 | struct platform_device *hci_dev; |
107 | struct resource hci_res[2]; | 107 | struct resource hci_res[2]; |
108 | int ret = -ENOMEM; | 108 | int ret; |
109 | 109 | ||
110 | memset(hci_res, 0, sizeof(hci_res)); | 110 | memset(hci_res, 0, sizeof(hci_res)); |
111 | 111 | ||
@@ -119,7 +119,7 @@ static struct platform_device *ssb_hcd_create_pdev(struct ssb_device *dev, bool | |||
119 | hci_dev = platform_device_alloc(ohci ? "ohci-platform" : | 119 | hci_dev = platform_device_alloc(ohci ? "ohci-platform" : |
120 | "ehci-platform" , 0); | 120 | "ehci-platform" , 0); |
121 | if (!hci_dev) | 121 | if (!hci_dev) |
122 | return NULL; | 122 | return ERR_PTR(-ENOMEM); |
123 | 123 | ||
124 | hci_dev->dev.parent = dev->dev; | 124 | hci_dev->dev.parent = dev->dev; |
125 | hci_dev->dev.dma_mask = &hci_dev->dev.coherent_dma_mask; | 125 | hci_dev->dev.dma_mask = &hci_dev->dev.coherent_dma_mask; |