lkml.org 
[lkml]   [2019]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.0 118/139] net: ieee802154: fix missing checks for regmap_update_bits
    Date
    [ Upstream commit 22e8860cf8f777fbf6a83f2fb7127f682a8e9de4 ]

    regmap_update_bits could fail and deserves a check.

    The patch adds the checks and if it fails, returns its error
    code upstream.

    Signed-off-by: Kangjie Lu <kjlu@umn.edu>
    Reviewed-by: Mukesh Ojha <mojha@codeaurora.org>
    Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ieee802154/mcr20a.c | 6 ++++++
    1 file changed, 6 insertions(+)

    diff --git a/drivers/net/ieee802154/mcr20a.c b/drivers/net/ieee802154/mcr20a.c
    index c589f5ae75bb5..8bb53ec8d9cf2 100644
    --- a/drivers/net/ieee802154/mcr20a.c
    +++ b/drivers/net/ieee802154/mcr20a.c
    @@ -533,6 +533,8 @@ mcr20a_start(struct ieee802154_hw *hw)
    dev_dbg(printdev(lp), "no slotted operation\n");
    ret = regmap_update_bits(lp->regmap_dar, DAR_PHY_CTRL1,
    DAR_PHY_CTRL1_SLOTTED, 0x0);
    + if (ret < 0)
    + return ret;

    /* enable irq */
    enable_irq(lp->spi->irq);
    @@ -540,11 +542,15 @@ mcr20a_start(struct ieee802154_hw *hw)
    /* Unmask SEQ interrupt */
    ret = regmap_update_bits(lp->regmap_dar, DAR_PHY_CTRL2,
    DAR_PHY_CTRL2_SEQMSK, 0x0);
    + if (ret < 0)
    + return ret;

    /* Start the RX sequence */
    dev_dbg(printdev(lp), "start the RX sequence\n");
    ret = regmap_update_bits(lp->regmap_dar, DAR_PHY_CTRL1,
    DAR_PHY_CTRL1_XCVSEQ_MASK, MCR20A_XCVSEQ_RX);
    + if (ret < 0)
    + return ret;

    return 0;
    }
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-05-23 21:39    [W:2.639 / U:0.848 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site