diff options
Diffstat (limited to 'net/nfc')
| -rw-r--r-- | net/nfc/nci/data.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/nfc/nci/data.c b/net/nfc/nci/data.c index a0bc326308a5..76c48c5324f8 100644 --- 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, | |||
| 49 | 49 | ||
| 50 | if (cb) { | 50 | if (cb) { |
| 51 | ndev->data_exchange_cb = NULL; | 51 | ndev->data_exchange_cb = NULL; |
| 52 | ndev->data_exchange_cb_context = 0; | 52 | ndev->data_exchange_cb_context = NULL; |
| 53 | 53 | ||
| 54 | /* forward skb to nfc core */ | 54 | /* forward skb to nfc core */ |
| 55 | cb(cb_context, skb, err); | 55 | cb(cb_context, skb, err); |
| @@ -200,10 +200,10 @@ static void nci_add_rx_data_frag(struct nci_dev *ndev, | |||
| 200 | pr_err("error adding room for accumulated rx data\n"); | 200 | pr_err("error adding room for accumulated rx data\n"); |
| 201 | 201 | ||
| 202 | kfree_skb(skb); | 202 | kfree_skb(skb); |
| 203 | skb = 0; | 203 | skb = NULL; |
| 204 | 204 | ||
| 205 | kfree_skb(ndev->rx_data_reassembly); | 205 | kfree_skb(ndev->rx_data_reassembly); |
| 206 | ndev->rx_data_reassembly = 0; | 206 | ndev->rx_data_reassembly = NULL; |
| 207 | 207 | ||
| 208 | err = -ENOMEM; | 208 | err = -ENOMEM; |
| 209 | goto exit; | 209 | goto exit; |
| @@ -216,7 +216,7 @@ static void nci_add_rx_data_frag(struct nci_dev *ndev, | |||
| 216 | 216 | ||
| 217 | /* third, free old reassembly */ | 217 | /* third, free old reassembly */ |
| 218 | kfree_skb(ndev->rx_data_reassembly); | 218 | kfree_skb(ndev->rx_data_reassembly); |
| 219 | ndev->rx_data_reassembly = 0; | 219 | ndev->rx_data_reassembly = NULL; |
| 220 | } | 220 | } |
| 221 | 221 | ||
| 222 | if (pbf == NCI_PBF_CONT) { | 222 | if (pbf == NCI_PBF_CONT) { |