diff options
| author | Dale Farnsworth <dale@farnsworth.org> | 2007-09-28 09:30:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-09-29 00:46:30 -0400 |
| commit | 2bcff60f7ce88c09a2bc1302ff14510737bfcb7b (patch) | |
| tree | 4108d7a8293ff3a79e933e42773d821a27f64ca0 /drivers/net/mv643xx_eth.c | |
| parent | 1bef7dc00caa7bcbff4fdb55e599e2591461fafa (diff) | |
mv643xx_eth: Check ETH_INT_CAUSE_STATE bit
Commit 468d09f8946d40228c56de26fe4874b2f98067ed masked the "state"
interrupt (bit 20 of the cause register). This results in Radstone's
PPC7D repeatedly re-entering the interrupt routine, locking up the
board. The following patch returns the required handling for this
interrupt.
Signed-off-by: Martyn Welch <martyn.welch@radstone.co.uk>
Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/mv643xx_eth.c')
| -rw-r--r-- | drivers/net/mv643xx_eth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index 456d1e1c98bd..34288fe038c3 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c | |||
| @@ -534,7 +534,7 @@ static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id) | |||
| 534 | } | 534 | } |
| 535 | 535 | ||
| 536 | /* PHY status changed */ | 536 | /* PHY status changed */ |
| 537 | if (eth_int_cause_ext & ETH_INT_CAUSE_PHY) { | 537 | if (eth_int_cause_ext & (ETH_INT_CAUSE_PHY | ETH_INT_CAUSE_STATE)) { |
| 538 | struct ethtool_cmd cmd; | 538 | struct ethtool_cmd cmd; |
| 539 | 539 | ||
| 540 | if (mii_link_ok(&mp->mii)) { | 540 | if (mii_link_ok(&mp->mii)) { |