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 / ni65.c

diff --git a/drivers/net/ni65.c b/drivers/net/ni65.c
index 1dffbbf..bb42ff2 100644 (file)
--- a/drivers/net/ni65.c
+++ b/drivers/net/ni65.c
@@ -526,8 +526,7 @@ static int __init ni65_probe1(struct net_device *dev,int ioaddr)
                        ni65_init_lance(p,dev->dev_addr,0,0);
                        irq_mask = probe_irq_on();
                        writereg(CSR0_INIT|CSR0_INEA,CSR0); /* trigger interrupt */
-                       set_current_state(TASK_UNINTERRUPTIBLE);
-                       schedule_timeout(HZ/50);
+                       msleep(20);
                        dev->irq = probe_irq_off(irq_mask);
                        if(!dev->irq)
                        {
@@ -697,8 +696,7 @@ static void ni65_free_buffer(struct priv *p)
                return;
 
        for(i=0;i<TMDNUM;i++) {
-               if(p->tmdbounce[i])
-                       kfree(p->tmdbounce[i]);
+               kfree(p->tmdbounce[i]);
 #ifdef XMT_VIA_SKB
                if(p->tmd_skb[i])
                        dev_kfree_skb(p->tmd_skb[i]);
@@ -711,12 +709,10 @@ static void ni65_free_buffer(struct priv *p)
                if(p->recv_skb[i])
                        dev_kfree_skb(p->recv_skb[i]);
 #else
-               if(p->recvbounce[i])
-                       kfree(p->recvbounce[i]);
+               kfree(p->recvbounce[i]);
 #endif
        }
-       if(p->self)
-               kfree(p->self);
+       kfree(p->self);
 }