diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-23 16:44:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-23 16:44:01 -0700 |
| commit | 2ead1aa6f14ed542af0c9e2302a51ea02128f587 (patch) | |
| tree | dfaf465122239a8bb450913b2e95f4647d24892f /drivers/net/8390.c | |
| parent | 7f28f394bd68e58bf3938c67bbeca7825b4687b8 (diff) | |
| parent | c8868611389aa28e0e5e0d63f468727781eac68c (diff) | |
Merge branch 'upstream-fixes' from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/8390.c')
| -rw-r--r-- | drivers/net/8390.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |