diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-12-17 08:48:27 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-12-17 08:48:27 -0800 |
| commit | d3d3a134d75d28034b950bc0b6682ba0be976f37 (patch) | |
| tree | 71365703ae44c980a80f9b2c02d664cbc3ddd935 /net/nfc/nci/hci.c | |
| parent | a143f427f3e7c6d80bc1d288334706a1f8237f5f (diff) | |
| parent | 8b20b3796da06d8ada347c4eaf289c3127da155f (diff) | |
Merge branch 'v4.1/topic/rt' into linux-linaro-lsk-v4.1-rt
Diffstat (limited to 'net/nfc/nci/hci.c')
| -rw-r--r-- | net/nfc/nci/hci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/nfc/nci/hci.c b/net/nfc/nci/hci.c index ed54ec533836..b33fed6d1584 100644 --- a/net/nfc/nci/hci.c +++ b/net/nfc/nci/hci.c @@ -233,7 +233,7 @@ int nci_hci_send_cmd(struct nci_dev *ndev, u8 gate, u8 cmd, r = nci_request(ndev, nci_hci_send_data_req, (unsigned long)&data, msecs_to_jiffies(NCI_DATA_TIMEOUT)); - if (r == NCI_STATUS_OK) + if (r == NCI_STATUS_OK && skb) *skb = conn_info->rx_skb; return r; |