| From 8ef654b5b4fa820b693ae84d8d5f8c9090d0cef1 Mon Sep 17 00:00:00 2001 |
| From: Kangjie Lu <kjlu@umn.edu> |
| Date: Sun, 24 Mar 2019 18:18:56 -0500 |
| Subject: net: ieee802154: fix missing checks for regmap_update_bits |
| |
| [ 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 04891429a5542..fe4057fca83d8 100644 |
| --- a/drivers/net/ieee802154/mcr20a.c |
| +++ b/drivers/net/ieee802154/mcr20a.c |
| @@ -539,6 +539,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); |
| @@ -546,11 +548,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 |
| |
