Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46578a69 authored by Roel Kluin's avatar Roel Kluin Committed by David S. Miller
Browse files

net: variables reach -1, but 0 tested 



while (timeout--) { ... }

timeout becomes -1 if the loop isn't ended otherwise, not 0.

Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0047e5d2

drivers/net/ibm_newemac/phy.c

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ int emac_mii_reset_phy(struct mii_phy *phy) 


	udelay(300);



	while (limit--) {

	while (--limit) {

		val = phy_read(phy, MII_BMCR);

		if (val >= 0 && (val & BMCR_RESET) == 0)

			break;
@@ -84,7 +84,7 @@ int emac_mii_reset_gpcs(struct mii_phy *phy) 


	udelay(300);



	while (limit--) {

	while (--limit) {

		val = gpcs_phy_read(phy, MII_BMCR);

		if (val >= 0 && (val & BMCR_RESET) == 0)

			break;

drivers/net/smc911x.c

+2 −2
Original line number Diff line number Diff line
@@ -220,9 +220,9 @@ static void smc911x_reset(struct net_device *dev) 


	/* make sure EEPROM has finished loading before setting GPIO_CFG */

	timeout=1000;

	while ( timeout-- && (SMC_GET_E2P_CMD(lp) & E2P_CMD_EPC_BUSY_)) {

	while (--timeout && (SMC_GET_E2P_CMD(lp) & E2P_CMD_EPC_BUSY_))

		udelay(10);

	}



	if (timeout == 0){

		PRINTK("%s: smc911x_reset timeout waiting for EEPROM busy\n", dev->name);

		return;

drivers/net/smsc9420.c

+6 −6
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ static void smsc9420_check_mac_address(struct net_device *dev) 
static void smsc9420_stop_tx(struct smsc9420_pdata *pd)

{

	u32 dmac_control, mac_cr, dma_intr_ena;

	int timeOut = 1000;

	int timeout = 1000;



	/* disable TX DMAC */

	dmac_control = smsc9420_reg_read(pd, DMAC_CONTROL);
@@ -506,13 +506,13 @@ static void smsc9420_stop_tx(struct smsc9420_pdata *pd) 
	smsc9420_reg_write(pd, DMAC_CONTROL, dmac_control);



	/* Wait max 10ms for transmit process to stop */

	while (timeOut--) {

	while (--timeout) {

		if (smsc9420_reg_read(pd, DMAC_STATUS) & DMAC_STS_TS_)

			break;

		udelay(10);

	}



	if (!timeOut)

	if (!timeout)

		smsc_warn(IFDOWN, "TX DMAC failed to stop");



	/* ACK Tx DMAC stop bit */
@@ -596,7 +596,7 @@ static void smsc9420_free_rx_ring(struct smsc9420_pdata *pd) 


static void smsc9420_stop_rx(struct smsc9420_pdata *pd)

{

	int timeOut = 1000;

	int timeout = 1000;

	u32 mac_cr, dmac_control, dma_intr_ena;



	/* mask RX DMAC interrupts */
@@ -617,13 +617,13 @@ static void smsc9420_stop_rx(struct smsc9420_pdata *pd) 
	smsc9420_pci_flush_write(pd);



	/* wait up to 10ms for receive to stop */

	while (timeOut--) {

	while (--timeout) {

		if (smsc9420_reg_read(pd, DMAC_STATUS) & DMAC_STS_RS_)

			break;

		udelay(10);

	}



	if (!timeOut)

	if (!timeout)

		smsc_warn(IFDOWN, "RX DMAC did not stop! timeout.");



	/* ACK the Rx DMAC stop bit */

drivers/net/sungem.c

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ static u16 __phy_read(struct gem *gp, int phy_addr, int reg) 
	cmd |= (MIF_FRAME_TAMSB);

	writel(cmd, gp->regs + MIF_FRAME);



	while (limit--) {

	while (--limit) {

		cmd = readl(gp->regs + MIF_FRAME);

		if (cmd & MIF_FRAME_TALSB)

			break;

drivers/net/sunqe.c

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ static int qe_init(struct sunqe *qep, int from_irq) 
	if (!(sbus_readb(mregs + MREGS_PHYCONFIG) & MREGS_PHYCONFIG_LTESTDIS)) {

		int tries = 50;



		while (tries--) {

		while (--tries) {

			u8 tmp;



			mdelay(5);