diff --git a/[refs] b/[refs]
index 6a7e6252788d..7e3b5275fbdb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6781f2af8567524f8c95d9907718a6c61fe417d
+refs/heads/master: 5b5103ec2dba07a15861e81cb783dd0fbaed24ed
diff --git a/trunk/drivers/net/r6040.c b/trunk/drivers/net/r6040.c
index 3c27a7bfea49..9c95ebe643a3 100644
--- a/trunk/drivers/net/r6040.c
+++ b/trunk/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;