Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[~andy/linux] / net / nfc / nci / data.c

diff --git a/net/nfc/nci/data.c b/net/nfc/nci/data.c
index a0bc326308a56911c4f3b26358971df21ad65399..76c48c5324f8fd44226d8d7b8997160dd6b062be 100644 (file)
--- a/net/nfc/nci/data.c
+++ b/net/nfc/nci/data.c
@@ -49,7 +49,7 @@ void nci_data_exchange_complete(struct nci_dev *ndev, struct sk_buff *skb,
 
        if (cb) {
                ndev->data_exchange_cb = NULL;
-               ndev->data_exchange_cb_context = 0;
+               ndev->data_exchange_cb_context = NULL;
 
                /* forward skb to nfc core */
                cb(cb_context, skb, err);
@@ -200,10 +200,10 @@ static void nci_add_rx_data_frag(struct nci_dev *ndev,
                        pr_err("error adding room for accumulated rx data\n");
 
                        kfree_skb(skb);
-                       skb = 0;
+                       skb = NULL;
 
                        kfree_skb(ndev->rx_data_reassembly);
-                       ndev->rx_data_reassembly = 0;
+                       ndev->rx_data_reassembly = NULL;
 
                        err = -ENOMEM;
                        goto exit;
@@ -216,7 +216,7 @@ static void nci_add_rx_data_frag(struct nci_dev *ndev,
 
                /* third, free old reassembly */
                kfree_skb(ndev->rx_data_reassembly);
-               ndev->rx_data_reassembly = 0;
+               ndev->rx_data_reassembly = NULL;
        }
 
        if (pbf == NCI_PBF_CONT) {