Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[linux-2.6-omap-h63xx.git] / drivers / net / r6040.c

diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c
index 3c27a7bfea49f70737004aead04b48f6d44f7d91..9c95ebe643a329f129538f352d3fe97adc8ada38 100644 (file)
--- a/drivers/net/r6040.c
+++ b/drivers/net/r6040.c
@@ -484,12 +484,12 @@ static int r6040_close(struct net_device *dev)
        /* Free Descriptor memory */
        if (lp->rx_ring) {
                pci_free_consistent(pdev, RX_DESC_SIZE, lp->rx_ring, lp->rx_ring_dma);
-               lp->rx_ring = 0;
+               lp->rx_ring = NULL;
        }
 
        if (lp->tx_ring) {
                pci_free_consistent(pdev, TX_DESC_SIZE, lp->tx_ring, lp->tx_ring_dma);
-               lp->tx_ring = 0;
+               lp->tx_ring = NULL;
        }
 
        return 0;