Browse Source

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>
Hauke Mehrtens 10 years ago
parent
commit
87997195e3
1 changed files with 2 additions and 2 deletions
  1. 2 2
      drivers/usb/host/ssb-hcd.c

+ 2 - 2
drivers/usb/host/ssb-hcd.c

@@ -105,7 +105,7 @@ static struct platform_device *ssb_hcd_create_pdev(struct ssb_device *dev, bool
 {
 {
 	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));
 
 
@@ -119,7 +119,7 @@ static struct platform_device *ssb_hcd_create_pdev(struct ssb_device *dev, bool
 	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;