From: Paul Gortmaker <p_gortmaker@yahoo.com>
Date: Fri, 23 Sep 2005 09:18:45 +0000 (-0400)
Subject: [PATCH] 8390 Tx fix for non i386 machines
X-Git-Tag: v2.6.14-rc3~51^2~6^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9389d79fbf9a0167ff2de87e8796c6bb803219bf;p=linux-2.6-omap-h63xx.git

[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.
---

diff --git a/drivers/net/8390.c b/drivers/net/8390.c
index 6d76f3a99b1..f8702742008 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);