On Mon, May 16, 2011 at 05:54:07PM +0530, Keshava Munegowda wrote:
> From: Axel Lin <axel.lin@xxxxxxxxx>
>
> rebased on top of hwmod and runtime pm patch series of usbhs
>
> Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
> Tested-by: Keshava Munegowda <keshava_mgowda@xxxxxx>
Acked-by: Felipe Balbi <balbi@xxxxxx>
> ---
> drivers/mfd/omap-usb-host.c | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
> index e1bc3b5..32d19e2 100644
> --- a/drivers/mfd/omap-usb-host.c
> +++ b/drivers/mfd/omap-usb-host.c
> @@ -282,6 +282,7 @@ static int omap_usbhs_alloc_children(struct platform_device *pdev)
>
> if (!ehci) {
> dev_err(dev, "omap_usbhs_alloc_child failed\n");
> + ret = -ENOMEM;
> goto err_end;
> }
>
> @@ -305,13 +306,14 @@ static int omap_usbhs_alloc_children(struct platform_device *pdev)
> sizeof(*ohci_data), dev);
> if (!ohci) {
> dev_err(dev, "omap_usbhs_alloc_child failed\n");
> + ret = -ENOMEM;
> goto err_ehci;
> }
>
> return 0;
>
> err_ehci:
> - platform_device_put(ehci);
> + platform_device_unregister(ehci);
>
> err_end:
> return ret;
> --
> 1.6.0.4
>
--
balbi
Attachment:
signature.asc
Description: Digital signature
