summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorPaul Gortmaker <p_gortmaker@yahoo.com>2005-09-23 11:18:45 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-09-23 11:18:45 +0200
commit9389d79fbf9a0167ff2de87e8796c6bb803219bf (patch)
tree760e6d88a9cd18cd3f8e22ab7ce374aa124c36fd /drivers/net
parent[PATCH] ppc32: Fix configuration of PCI IO space on MPC85xx platform (diff)
downloadlinux-9389d79fbf9a0167ff2de87e8796c6bb803219bf.tar.xz
linux-9389d79fbf9a0167ff2de87e8796c6bb803219bf.zip
[PATCH] 8390 Tx fix for non i386 machines
While this is true, E8390_CMD is zero on i386, and thus there should be no effect for these machines. Machines like Mac, Amiga etc. which use Alan's clever register mapping may have a non-zero E8390_CMD and result in bogus "transmitter busy" type messages from this bug. Fixes BUG# 3991.
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/8390.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/8390.c b/drivers/net/8390.c
index 6d76f3a99b17..f87027420081 100644
--- a/drivers/net/8390.c
+++ b/drivers/net/8390.c
@@ -1094,7 +1094,7 @@ static void NS8390_trigger_send(struct net_device *dev, unsigned int length,
outb_p(E8390_NODMA+E8390_PAGE0, e8390_base+E8390_CMD);
- if (inb_p(e8390_base) & E8390_TRANS)
+ if (inb_p(e8390_base + E8390_CMD) & E8390_TRANS)
{
printk(KERN_WARNING "%s: trigger_send() called with the transmitter busy.\n",
dev->name);