diff options
author | Alexander Aring <alex.aring@gmail.com> | 2014-07-02 18:20:49 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-07-08 00:29:25 -0400 |
commit | 6bd2b132bfbaea46abbcc65f1be57709b2fb601a (patch) | |
tree | 9493292261b280336ab4c37bd9916e485ae72e97 /drivers/net/ieee802154 | |
parent | 1d15d6b5b951063184c1749f6145db3170de9e07 (diff) |
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 <alex.aring@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ieee802154')
-rw-r--r-- | drivers/net/ieee802154/at86rf230.c | 9 |
1 files changed, 4 insertions, 5 deletions
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: | |||
1010 | static int | 1010 | static int |
1011 | at86rf230_start(struct ieee802154_dev *dev) | 1011 | at86rf230_start(struct ieee802154_dev *dev) |
1012 | { | 1012 | { |
1013 | struct at86rf230_local *lp = dev->priv; | ||
1014 | u8 rc; | 1013 | u8 rc; |
1015 | 1014 | ||
1016 | rc = at86rf230_write_subreg(lp, SR_RX_SAFE_MODE, 1); | ||
1017 | if (rc) | ||
1018 | return rc; | ||
1019 | |||
1020 | rc = at86rf230_state(dev, STATE_TX_ON); | 1015 | rc = at86rf230_state(dev, STATE_TX_ON); |
1021 | if (rc) | 1016 | if (rc) |
1022 | return rc; | 1017 | return rc; |
@@ -1300,6 +1295,10 @@ static int at86rf230_hw_init(struct at86rf230_local *lp) | |||
1300 | if (rc) | 1295 | if (rc) |
1301 | return rc; | 1296 | return rc; |
1302 | 1297 | ||
1298 | rc = at86rf230_write_subreg(lp, SR_RX_SAFE_MODE, 1); | ||
1299 | if (rc) | ||
1300 | return rc; | ||
1301 | |||
1303 | rc = at86rf230_write_subreg(lp, SR_IRQ_MASK, IRQ_TRX_END); | 1302 | rc = at86rf230_write_subreg(lp, SR_IRQ_MASK, IRQ_TRX_END); |
1304 | if (rc) | 1303 | if (rc) |
1305 | return rc; | 1304 | return rc; |