OSDN Git Service

USB: ssb: fix error handling in ssb_hcd_create_pdev()
authorHauke Mehrtens <hauke@hauke-m.de>
Sat, 6 Jun 2015 19:53:03 +0000 (21:53 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Jun 2015 21:26:22 +0000 (14:26 -0700)
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/ssb-hcd.c

index ffc32f4..623cb0b 100644 (file)
@@ -105,7 +105,7 @@ static struct platform_device *ssb_hcd_create_pdev(struct ssb_device *dev, bool
 {
        struct platform_device *hci_dev;
        struct resource hci_res[2];
-       int ret = -ENOMEM;
+       int ret;
 
        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" :
                                        "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;