summaryrefslogtreecommitdiffstats
path: root/drivers/nfc/pn544_hci.c
diff options
context:
space:
mode:
authorWaldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>2012-09-20 08:59:10 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2012-09-25 00:17:27 +0200
commit96e324024b421b3753eb142d5d92fbe4ac5e7519 (patch)
treec05ff22fb3bda8511ec18ffc997c31e074e1d0c3 /drivers/nfc/pn544_hci.c
parent5adf54de97270256f6ec0e368ddde68ac516b692 (diff)
downloadop-kernel-dev-96e324024b421b3753eb142d5d92fbe4ac5e7519.zip
op-kernel-dev-96e324024b421b3753eb142d5d92fbe4ac5e7519.tar.gz
NFC: xmit from hci ops must return 0 or negative
xmit callback provided by a driver encapsulates upper layers data and sends it to the hardware. So, HCI does not know the exact amount of data being sent and thus can't handle partially sent frames properly. Therefore, the driver must return 0 for completely sent frame or negative for failure. Signed-off-by: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com> Acked-by: Eric Lapuyade <eric.lapuyade@intel.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc/pn544_hci.c')
-rw-r--r--drivers/nfc/pn544_hci.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/nfc/pn544_hci.c b/drivers/nfc/pn544_hci.c
index 7b0c217..c9c8570 100644
--- a/drivers/nfc/pn544_hci.c
+++ b/drivers/nfc/pn544_hci.c
@@ -235,8 +235,12 @@ static int pn544_hci_i2c_write(struct i2c_client *client, u8 *buf, int len)
r = i2c_master_send(client, buf, len);
}
- if (r >= 0 && r != len)
- r = -EREMOTEIO;
+ if (r >= 0) {
+ if (r != len)
+ return -EREMOTEIO;
+ else
+ return 0;
+ }
return r;
}
OpenPOWER on IntegriCloud