summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorNicholas Mc Guire <der.herr@hofr.at>2017-01-22 13:28:39 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2017-04-02 00:29:53 +0200
commit96bd0b5e550f26e8472c624d1aabe7448d0a7c27 (patch)
tree958c886593cd0aba8e8fbbe879e696e53c509b1a /drivers/nfc
parentNFC: st21nfca: Fix potential memory leak (diff)
downloadlinux-96bd0b5e550f26e8472c624d1aabe7448d0a7c27.tar.xz
linux-96bd0b5e550f26e8472c624d1aabe7448d0a7c27.zip
nfc: nxp-nci: use msleep for long delays
ulseep_range() uses hrtimers and provides no advantage over msleep() for larger delays. For this large delay msleep() is preferable. Fixes: commit 6be88670fc59 ("NFC: nxp-nci_i2c: Add I2C support to NXP NCI driver") Link: http://lkml.org/lkml/2017/1/11/377 Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
-rw-r--r--drivers/nfc/nxp-nci/i2c.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nfc/nxp-nci/i2c.c b/drivers/nfc/nxp-nci/i2c.c
index ae69d2f73700..c6a04a950225 100644
--- a/drivers/nfc/nxp-nci/i2c.c
+++ b/drivers/nfc/nxp-nci/i2c.c
@@ -85,7 +85,7 @@ static int nxp_nci_i2c_write(void *phy_id, struct sk_buff *skb)
r = i2c_master_send(client, skb->data, skb->len);
if (r < 0) {
/* Retry, chip was in standby */
- usleep_range(110000, 120000);
+ msleep(110);
r = i2c_master_send(client, skb->data, skb->len);
}