summaryrefslogtreecommitdiffstats
path: root/drivers/net/8390.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@starflyer.(none)>2005-09-25 05:14:45 +0200
committerDave Airlie <airlied@linux.ie>2005-09-25 05:14:45 +0200
commit4e0c1159d83a658d1ffba5bc3442f4ec4cadb436 (patch)
tree36a5079ba7ba9b9e0f2f633356705b980940eac4 /drivers/net/8390.c
parentdrm: add radeon PCI express support (diff)
parentMerge master.kernel.org:/home/rmk/linux-2.6-ucb (diff)
downloadlinux-4e0c1159d83a658d1ffba5bc3442f4ec4cadb436.tar.xz
linux-4e0c1159d83a658d1ffba5bc3442f4ec4cadb436.zip
update from upstream
Diffstat (limited to 'drivers/net/8390.c')
-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);