lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

usb: tilegx: fix memleak when create hcd fail

Browse Source 
When usb_create_hcd fail, we should call gxio_usb_host_destroy

Signed-off-by: Libo Chen <libo.chen@huawei.com>
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com> [extended to EHCI]
This commit is contained in:
Libo Chen
2013-05-09 02:08:33 -04:00
committed by Chris Metcalf
parent 4833d7f0a8
commit abab8761d0
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/usb/host/ehci-tilegx.c
View File

@@ -118,8 +118,10 @@ static int ehci_hcd_tilegx_drv_probe(struct platform_device *pdev)
hcd = usb_create_hcd(&ehci_tilegx_hc_driver, &pdev->dev, hcd = usb_create_hcd(&ehci_tilegx_hc_driver, &pdev->dev,
dev_name(&pdev->dev)); dev_name(&pdev->dev));
if (!hcd) if (!hcd) {
return -ENOMEM; ret = -ENOMEM;
goto err_hcd;
}
/* /*
* We don't use rsrc_start to map in our registers, but seems like * We don't use rsrc_start to map in our registers, but seems like
@@ -176,6 +178,7 @@ err_have_irq:
err_no_irq: err_no_irq:
tilegx_stop_ehc(); tilegx_stop_ehc();
usb_put_hcd(hcd); usb_put_hcd(hcd);
err_hcd:
gxio_usb_host_destroy(&pdata->usb_ctx); gxio_usb_host_destroy(&pdata->usb_ctx);
return ret; return ret;
} }

7
drivers/usb/host/ohci-tilegx.c
View File

@@ -112,8 +112,10 @@ static int ohci_hcd_tilegx_drv_probe(struct platform_device *pdev)
hcd = usb_create_hcd(&ohci_tilegx_hc_driver, &pdev->dev, hcd = usb_create_hcd(&ohci_tilegx_hc_driver, &pdev->dev,
dev_name(&pdev->dev)); dev_name(&pdev->dev));
if (!hcd) if (!hcd) {
return -ENOMEM; ret = -ENOMEM;
goto err_hcd;
}
/* /*
* We don't use rsrc_start to map in our registers, but seems like * We don't use rsrc_start to map in our registers, but seems like
@@ -165,6 +167,7 @@ err_have_irq:
err_no_irq: err_no_irq:
tilegx_stop_ohc(); tilegx_stop_ohc();
usb_put_hcd(hcd); usb_put_hcd(hcd);
err_hcd:
gxio_usb_host_destroy(&pdata->usb_ctx); gxio_usb_host_destroy(&pdata->usb_ctx);
return ret; return ret;
} }