Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

[linux-2.6] / drivers / net / sundance.c

diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
index 02679e688c4c7e933960944682174f9e15188fdb..c06ecc8002b9e4e9352171e9d745f225a123ea43 100644 (file)
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
@@ -1102,7 +1102,7 @@ reset_tx (struct net_device *dev)
        np->cur_tx = np->dirty_tx = 0;
        np->cur_task = 0;
 
-       np->last_tx = 0;
+       np->last_tx = NULL;
        iowrite8(127, ioaddr + TxDMAPollPeriod);
 
        iowrite16 (StatsEnable | RxEnable | TxEnable, ioaddr + MACCtrl1);
@@ -1648,7 +1648,7 @@ static int netdev_close(struct net_device *dev)
        np->cur_tx = 0;
        np->dirty_tx = 0;
        np->cur_task = 0;
-       np->last_tx = 0;
+       np->last_tx = NULL;
 
        netif_stop_queue(dev);