lkml.org 
[lkml]   [2011]   [May]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v1] mfd: Fix omap_usbhs_alloc_children error handling
    Date
    From: Axel Lin <axel.lin@gmail.com>

    rebased on top of hwmod and runtime pm patch series of usbhs

    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    Tested-by: Keshava Munegowda <keshava_mgowda@ti.com>
    ---
    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


    \
     
     \ /
      Last update: 2011-05-16 14:31    [W:0.022 / U:60.688 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site