diff options
| author | Christophe Ricard <christophe.ricard@gmail.com> | 2015-10-25 22:54:44 +0100 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2015-10-27 03:55:13 +0100 |
| commit | 064d00479697907730a4aff9edf879c0ca4743f0 (patch) | |
| tree | d6126d57ece21b0da692a98914cf7e246054be43 | |
| parent | NFC: netlink: Add mode parameter to deactivate_target functions (diff) | |
| download | linux-064d00479697907730a4aff9edf879c0ca4743f0.tar.xz linux-064d00479697907730a4aff9edf879c0ca4743f0.zip | |
NFC: st-nci: Add few code style fixes
Add some few code style fixes.
Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| -rw-r--r-- | drivers/nfc/st-nci/i2c.c | 2 | ||||
| -rw-r--r-- | drivers/nfc/st-nci/se.c | 2 | ||||
| -rw-r--r-- | net/nfc/nci/hci.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/nfc/st-nci/i2c.c b/drivers/nfc/st-nci/i2c.c index 172cbc34cc9f..2a96f1a415e4 100644 --- a/drivers/nfc/st-nci/i2c.c +++ b/drivers/nfc/st-nci/i2c.c @@ -32,7 +32,7 @@ #define DRIVER_DESC "NCI NFC driver for ST_NCI" /* ndlc header */ -#define ST_NCI_FRAME_HEADROOM 1 +#define ST_NCI_FRAME_HEADROOM 1 #define ST_NCI_FRAME_TAILROOM 0 #define ST_NCI_I2C_MIN_SIZE 4 /* PCB(1) + NCI Packet header(3) */ diff --git a/drivers/nfc/st-nci/se.c b/drivers/nfc/st-nci/se.c index 1cc24b6623e0..dbab722a0654 100644 --- a/drivers/nfc/st-nci/se.c +++ b/drivers/nfc/st-nci/se.c @@ -62,7 +62,7 @@ struct st_nci_pipe_info { #define ST_NCI_EVT_SE_HARD_RESET 0x20 #define ST_NCI_EVT_TRANSMIT_DATA 0x10 -#define ST_NCI_EVT_WTX_REQUEST 0x11 +#define ST_NCI_EVT_WTX_REQUEST 0x11 #define ST_NCI_EVT_SE_SOFT_RESET 0x11 #define ST_NCI_EVT_SE_END_OF_APDU_TRANSFER 0x21 #define ST_NCI_EVT_HOT_PLUG 0x03 diff --git a/net/nfc/nci/hci.c b/net/nfc/nci/hci.c index c96830421097..2aedac15cb59 100644 --- a/net/nfc/nci/hci.c +++ b/net/nfc/nci/hci.c @@ -407,7 +407,7 @@ static void nci_hci_hcp_message_rx(struct nci_dev *ndev, u8 pipe, break; } - nci_req_complete(ndev, 0); + nci_req_complete(ndev, NCI_STATUS_OK); } static void nci_hci_msg_rx_work(struct work_struct *work) |