* [patch -mainline] amd-xgbe: fix a couple timeout loops
@ 2015-12-15 10:12 Dan Carpenter
2015-12-15 17:51 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2015-12-15 10:12 UTC (permalink / raw)
To: Tom Lendacky; +Cc: netdev, kernel-janitors
At the end of the loop we test "if (!count)" but because "count--" is
a post-op then the loop will end with count set to -1. I have fixed
this by changing it to --count.
Fixes: c5aa9e3b8156 ('amd-xgbe: Initial AMD 10GbE platform driver')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
index 970781a..f6a7161 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
@@ -1849,7 +1849,7 @@ static int xgbe_exit(struct xgbe_prv_data *pdata)
usleep_range(10, 15);
/* Poll Until Poll Condition */
- while (count-- && XGMAC_IOREAD_BITS(pdata, DMA_MR, SWR))
+ while (--count && XGMAC_IOREAD_BITS(pdata, DMA_MR, SWR))
usleep_range(500, 600);
if (!count)
@@ -1873,7 +1873,7 @@ static int xgbe_flush_tx_queues(struct xgbe_prv_data *pdata)
/* Poll Until Poll Condition */
for (i = 0; i < pdata->tx_q_count; i++) {
count = 2000;
- while (count-- && XGMAC_MTL_IOREAD_BITS(pdata, i,
+ while (--count && XGMAC_MTL_IOREAD_BITS(pdata, i,
MTL_Q_TQOMR, FTQ))
usleep_range(500, 600);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [patch -mainline] amd-xgbe: fix a couple timeout loops
2015-12-15 10:12 [patch -mainline] amd-xgbe: fix a couple timeout loops Dan Carpenter
@ 2015-12-15 17:51 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2015-12-15 17:51 UTC (permalink / raw)
To: dan.carpenter; +Cc: thomas.lendacky, netdev, kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Tue, 15 Dec 2015 13:12:29 +0300
> At the end of the loop we test "if (!count)" but because "count--" is
> a post-op then the loop will end with count set to -1. I have fixed
> this by changing it to --count.
>
> Fixes: c5aa9e3b8156 ('amd-xgbe: Initial AMD 10GbE platform driver')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-12-15 17:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-15 10:12 [patch -mainline] amd-xgbe: fix a couple timeout loops Dan Carpenter
2015-12-15 17:51 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).