projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'asoc/topic/fsl-spdif', 'asoc/topic/hdmi', 'asoc/topic...
[linux-2.6-block.git]
/
drivers
/
net
/
ethernet
/
agere
/
et131x.c
diff --git
a/drivers/net/ethernet/agere/et131x.c
b/drivers/net/ethernet/agere/et131x.c
index 30defe6c81f22d6463c4df091a421014392f6ff2..821d86c38ab214a9c450f3079398b1d3a4af2e24 100644
(file)
--- a/
drivers/net/ethernet/agere/et131x.c
+++ b/
drivers/net/ethernet/agere/et131x.c
@@
-3851,7
+3851,7
@@
static void et131x_tx_timeout(struct net_device *netdev)
unsigned long flags;
/* If the device is closed, ignore the timeout */
- if (
~
(adapter->flags & FMP_ADAPTER_INTERRUPT_IN_USE))
+ if (
!
(adapter->flags & FMP_ADAPTER_INTERRUPT_IN_USE))
return;
/* Any nonrecoverable hardware error?