From: Alexander Aring Date: Wed, 2 Jul 2014 22:20:49 +0000 (+0200) Subject: at86rf230: move RX_SAFE_MODE setting to hw_init X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=6bd2b132bfbaea46abbcc65f1be57709b2fb601a;p=openwrt%2Fstaging%2Fblogic.git at86rf230: move RX_SAFE_MODE setting to hw_init There is no need to set this bit in start callback which could be called more than once. Signed-off-by: Alexander Aring Signed-off-by: David S. Miller --- diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c index 39c3c117340d..492fb7e7675d 100644 --- a/drivers/net/ieee802154/at86rf230.c +++ b/drivers/net/ieee802154/at86rf230.c @@ -1010,13 +1010,8 @@ err: static int at86rf230_start(struct ieee802154_dev *dev) { - struct at86rf230_local *lp = dev->priv; u8 rc; - rc = at86rf230_write_subreg(lp, SR_RX_SAFE_MODE, 1); - if (rc) - return rc; - rc = at86rf230_state(dev, STATE_TX_ON); if (rc) return rc; @@ -1300,6 +1295,10 @@ static int at86rf230_hw_init(struct at86rf230_local *lp) if (rc) return rc; + rc = at86rf230_write_subreg(lp, SR_RX_SAFE_MODE, 1); + if (rc) + return rc; + rc = at86rf230_write_subreg(lp, SR_IRQ_MASK, IRQ_TRX_END); if (rc) return rc;