aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDale Farnsworth <dale@farnsworth.org>2006-03-03 11:59:28 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-03 12:12:36 -0500
commite38fd1a055cf4038c423bd841859b01aeb07d1b0 (patch)
tree5349f6114cfb86f7b9bc6b57ec1f1b2ca39e01e3
parentd5f9558a7778d3f7dc3c9e0d5cbe7318710532f8 (diff)
[PATCH] mv643xx_eth: Fix misplaced parenthesis in mv643xx_eth_port_disable_rx
This bug could result in a system hang. Signed-off-by: Dale Farnsworth <dale@farnsworth.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/net/mv643xx_eth.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 4f36489e7cdb..4cbf84052b0f 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -2496,8 +2496,8 @@ static unsigned int mv643xx_eth_port_disable_rx(unsigned int port_num)
2496 u32 channels; 2496 u32 channels;
2497 2497
2498 /* Stop Rx port activity. Check port Rx activity. */ 2498 /* Stop Rx port activity. Check port Rx activity. */
2499 channels = mv_read(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num) 2499 channels = mv_read(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num))
2500 & 0xFF); 2500 & 0xFF;
2501 if (channels) { 2501 if (channels) {
2502 /* Issue stop command for active channels only */ 2502 /* Issue stop command for active channels only */
2503 mv_write(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num), 2503 mv_write(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num),