openstlinux/linux-st
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

USB: bcma: fix error handling in bcma_hcd_create_pdev()

Browse Source 
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>
This commit is contained in:
Hauke Mehrtens
2015-06-11 22:57:38 +02:00
committed by Greg Kroah-Hartman
parent c27da2b22b
commit ab2de57930
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/usb/host/bcma-hcd.c
View File

@ -169,7 +169,7 @@ static struct platform_device *bcma_hcd_create_pdev(struct bcma_device *dev, boo
{ {
struct platform_device *hci_dev; struct platform_device *hci_dev;
struct resource hci_res[2]; struct resource hci_res[2];
int ret = -ENOMEM; int ret;
memset(hci_res, 0, sizeof(hci_res)); memset(hci_res, 0, sizeof(hci_res));
@ -183,7 +183,7 @@ static struct platform_device *bcma_hcd_create_pdev(struct bcma_device *dev, boo
hci_dev = platform_device_alloc(ohci ? "ohci-platform" : hci_dev = platform_device_alloc(ohci ? "ohci-platform" :
"ehci-platform" , 0); "ehci-platform" , 0);
if (!hci_dev) if (!hci_dev)
return NULL; return ERR_PTR(-ENOMEM);
hci_dev->dev.parent = &dev->dev; hci_dev->dev.parent = &dev->dev;
hci_dev->dev.dma_mask = &hci_dev->dev.coherent_dma_mask; hci_dev->dev.dma_mask = &hci_dev->dev.coherent_dma_mask;