Hi Stefan, > If we run into an error during rx we set the the error code in ret, but override > it afterwards. Using a different variable for the extra case avoids this > situation. > > CID: 1226982, 1226983 > Signed-off-by: Stefan Schmidt <stefan@xxxxxxxxxxxxxxx> > Cc: Alan Ott <alan@xxxxxxxxxxx> > --- > drivers/net/ieee802154/mrf24j40.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c > index 99c7676..0b9b2ae 100644 > --- a/drivers/net/ieee802154/mrf24j40.c > +++ b/drivers/net/ieee802154/mrf24j40.c > @@ -533,6 +533,7 @@ static int mrf24j40_handle_rx(struct mrf24j40 *devrec) > u8 lqi = 0; > u8 val; > int ret = 0; > + int ret2 = 0; > struct sk_buff *skb; > > /* Turn off reception of packets off the air. This prevents the > @@ -569,9 +570,9 @@ static int mrf24j40_handle_rx(struct mrf24j40 *devrec) > > out: > /* Turn back on reception of packets off the air. */ > - ret = read_short_reg(devrec, REG_BBREG1, &val); > - if (ret) > - return ret; > + ret2 = read_short_reg(devrec, REG_BBREG1, &val); > + if (ret2) > + return ret2; one of the general rule is to not declare a variable and assign it with a value unless really needed. In this case I think a simple int ret2; would be enough. Regards Marcel -- To unsubscribe from this list: send the line "unsubscribe linux-wpan" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
