lkml.org 
[lkml]   [2019]   [Dec]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 113/209] net: (cpts) fix a missing check of clk_prepare
    Date
    From: Kangjie Lu <kjlu@umn.edu>

    [ Upstream commit 2d822f2dbab7f4c820f72eb8570aacf3f35855bd ]

    clk_prepare() could fail, so let's check its status, and if it fails,
    return its error code upstream.

    Signed-off-by: Kangjie Lu <kjlu@umn.edu>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/ti/cpts.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/ti/cpts.c b/drivers/net/ethernet/ti/cpts.c
    index e7b76f6b4f67e..7d1281d812480 100644
    --- a/drivers/net/ethernet/ti/cpts.c
    +++ b/drivers/net/ethernet/ti/cpts.c
    @@ -567,7 +567,9 @@ struct cpts *cpts_create(struct device *dev, void __iomem *regs,
    return ERR_PTR(PTR_ERR(cpts->refclk));
    }

    - clk_prepare(cpts->refclk);
    + ret = clk_prepare(cpts->refclk);
    + if (ret)
    + return ERR_PTR(ret);

    cpts->cc.read = cpts_systim_read;
    cpts->cc.mask = CLOCKSOURCE_MASK(32);
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-04 19:06    [W:4.061 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site