Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / net / 8390.c

diff --git a/drivers/net/8390.c b/drivers/net/8390.c
index bab16bc..f870274 100644 (file)
--- a/drivers/net/8390.c
+++ b/drivers/net/8390.c
@@ -225,9 +225,9 @@ void ei_tx_timeout(struct net_device *dev)
        unsigned long icucr;
 
        local_irq_save(flags);
-       icucr = inl(ICUCR1);
+       icucr = inl(M32R_ICU_CR1_PORTL);
        icucr |= M32R_ICUCR_ISMOD11;
-       outl(icucr, ICUCR1);
+       outl(icucr, M32R_ICU_CR1_PORTL);
        local_irq_restore(flags);
 #endif
        ei_local->stat.tx_errors++;
@@ -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);