Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abab8761 authored by Libo Chen's avatar Libo Chen Committed by Chris Metcalf
Browse files

usb: tilegx: fix memleak when create hcd fail 



When usb_create_hcd fail, we should call gxio_usb_host_destroy

Signed-off-by: default avatarLibo Chen <libo.chen@huawei.com>
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com> [extended to EHCI]
parent 4833d7f0

drivers/usb/host/ehci-tilegx.c

+5 −2
Original line number Diff line number Diff line
@@ -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,

			     dev_name(&pdev->dev));

	if (!hcd)

		return -ENOMEM;

	if (!hcd) {

          ret = -ENOMEM;

          goto err_hcd;

        }



	/*

	 * We don't use rsrc_start to map in our registers, but seems like
@@ -176,6 +178,7 @@ err_have_irq: 
err_no_irq:

	tilegx_stop_ehc();

	usb_put_hcd(hcd);

err_hcd:

	gxio_usb_host_destroy(&pdata->usb_ctx);

	return ret;

}

drivers/usb/host/ohci-tilegx.c

+5 −2
Original line number Diff line number Diff line
@@ -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,

			     dev_name(&pdev->dev));

	if (!hcd)

		return -ENOMEM;

	if (!hcd) {

		ret = -ENOMEM;

		goto err_hcd;

	}



	/*

	 * We don't use rsrc_start to map in our registers, but seems like
@@ -165,6 +167,7 @@ err_have_irq: 
err_no_irq:

	tilegx_stop_ohc();

	usb_put_hcd(hcd);

err_hcd:

	gxio_usb_host_destroy(&pdata->usb_ctx);

	return ret;

}