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

Commit 6ee12b7b authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ieee802154-for-davem-2019-04-25' of... 

Merge branch 'ieee802154-for-davem-2019-04-25' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan



Stefan Schmidt says:

====================
ieee802154 for net 2019-04-25

An update from ieee802154 for your *net* tree.

Another fix from Kangjie Lu to ensure better checking regmap updates in the
mcr20a driver. Nothing else I have pending for the final release.

If there are any problems let me know.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2ae7a397 22e8860c

drivers/net/ieee802154/mcr20a.c

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

}