lkml.org 
[lkml]   [2017]   [Jun]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/5] clocksource/drivers/fsl_ftm_timer: Unmap region obtained by of_iomap
    Date
    From: Arvind Yadav <arvind.yadav.cs@gmail.com>

    In case of error at init time, rollback iomapping.

    Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
    Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
    ---
    drivers/clocksource/fsl_ftm_timer.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    diff --git a/drivers/clocksource/fsl_ftm_timer.c b/drivers/clocksource/fsl_ftm_timer.c
    index 3121e2d..3ee7e6f 100644
    --- a/drivers/clocksource/fsl_ftm_timer.c
    +++ b/drivers/clocksource/fsl_ftm_timer.c
    @@ -329,13 +329,13 @@ static int __init ftm_timer_init(struct device_node *np)
    priv->clkevt_base = of_iomap(np, 0);
    if (!priv->clkevt_base) {
    pr_err("ftm: unable to map event timer registers\n");
    - goto err;
    + goto err_clkevt;
    }

    priv->clksrc_base = of_iomap(np, 1);
    if (!priv->clksrc_base) {
    pr_err("ftm: unable to map source timer registers\n");
    - goto err;
    + goto err_clksrc;
    }

    ret = -EINVAL;
    @@ -366,6 +366,10 @@ static int __init ftm_timer_init(struct device_node *np)
    return 0;

    err:
    + iounmap(priv->clksrc_base);
    +err_clksrc:
    + iounmap(priv->clkevt_base);
    +err_clkevt:
    kfree(priv);
    return ret;
    }
    --
    2.7.4
    \
     
     \ /
      Last update: 2017-06-27 11:30    [W:3.734 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site