lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 5 Feb 2014 16:10:23 -0800 From: Nithin Nayak Sujir <nsujir@...adcom.com> To: Dan Carpenter <dan.carpenter@...cle.com> CC: Michael Chan <mchan@...adcom.com>, <netdev@...r.kernel.org>, <kernel-janitors@...r.kernel.org> Subject: Re: [patch] tg3: cleanup an error path in tg3_phy_reset_5703_4_5() On 02/05/2014 05:29 AM, Dan Carpenter wrote: > In the original code, if tg3_readphy() fails then it does an unnecessary > check to verify "err" is still zero and then returns -EBUSY. > > My static checker complains about the unnecessary "if (!err)" check and > anyway it is better to propagate the -EBUSY error code from > tg3_readphy() instead of hard coding it here. And really the original > code is confusing to look at. > > Signed-off-by: Dan Carpenter <dan.carpenter@...cle.com> > > diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c > index e2ca03e23dc1..c466e12b601e 100644 > --- a/drivers/net/ethernet/broadcom/tg3.c > +++ b/drivers/net/ethernet/broadcom/tg3.c > @@ -2609,13 +2609,14 @@ static int tg3_phy_reset_5703_4_5(struct tg3 *tp) > > tg3_writephy(tp, MII_CTRL1000, phy9_orig); > > - if (!tg3_readphy(tp, MII_TG3_EXT_CTRL, ®32)) { > - reg32 &= ~0x3000; > - tg3_writephy(tp, MII_TG3_EXT_CTRL, reg32); > - } else if (!err) > - err = -EBUSY; > + err = tg3_readphy(tp, MII_TG3_EXT_CTRL, ®32); > + if (err) > + return err; > > - return err; > + reg32 &= ~0x3000; > + tg3_writephy(tp, MII_TG3_EXT_CTRL, reg32); > + > + return 0; > } > > static void tg3_carrier_off(struct tg3 *tp) > Acked-by: Nithin Nayak Sujir <nsujir@...adcom.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists