Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36ae546a authored by Kangjie Lu's avatar Kangjie Lu Committed by Greg Kroah-Hartman
Browse files

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: default avatarKangjie Lu <kjlu@umn.edu>
Reviewed-by: default avatarMukesh Ojha <mojha@codeaurora.org>
Signed-off-by: default avatarStefan Schmidt <stefan@datenfreihafen.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 9c045d8c

drivers/net/ieee802154/mcr20a.c

+6 −0
Original line number Diff line number Diff line
@@ -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;

}