redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ieee802154: fix at86rf212_set_txpower() exit path 

The commit 9b2777d608 ("ieee802154: add TX power control to
wpan_phy") introduced the new function at86rf212_set_txpower() with
the questionable check of the return of __at86rf230_write() in the
exit path:

1) Both at86rf212_set_txpower() and __at86rf230_write() have the
   same return type.

2) Whatever __at86rf230_write() returns becomes the return value of
   at86rf212_set_txpower().

Thus, fix the exit path by getting rid of that check entirely.

Signed-off-by: Jean Sacren <sakiwit@gmail.com>
Cc: Phoebe Buckheister <phoebe.buckheister@itwm.fraunhofer.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
hifive-unleashed-5.1
Jean Sacren 2014-03-01 15:54:36 -07:00 committed by David S. Miller
parent 086928179c
commit 677676cd58
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/ieee802154/at86rf230.c
View File

@ -786,7 +786,6 @@ static int
at86rf212_set_txpower(struct ieee802154_dev *dev, int db)
{
struct at86rf230_local *lp = dev->priv;
int rc;
/* typical maximum output is 5dBm with RG_PHY_TX_PWR 0x60, lower five
* bits decrease power in 1dB steps. 0x60 represents extra PA gain of
@ -799,11 +798,7 @@ at86rf212_set_txpower(struct ieee802154_dev *dev, int db)
db = -(db - 5);
rc = __at86rf230_write(lp, RG_PHY_TX_PWR, 0x60 | db);
if (rc)
return rc;
return 0;
return __at86rf230_write(lp, RG_PHY_TX_PWR, 0x60 | db);
}
static int