Skip to content

Commit

Permalink
USB: ssb: fix error handling in ssb_hcd_create_pdev()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Hauke Mehrtens authored and Greg Kroah-Hartman committed Jun 8, 2015
1 parent e3e64f3 commit 8799719
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/usb/host/ssb-hcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand All @@ -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;
Expand Down

0 comments on commit 8799719

Please sign in to comment.