diff options
| author | David S. Miller <davem@davemloft.net> | 2016-07-20 23:39:36 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-07-20 23:39:36 -0700 |
| commit | 276b8c77c3e4838f574d37e25ec8ba52d0418475 (patch) | |
| tree | 99bf7313765ca10e40d5a1edde2a5db44143bfb7 /drivers/nfc/trf7970a.c | |
| parent | 0f06a6787e0516352117f0720e3052f46bc13523 (diff) | |
| parent | 2a0fe4fe5bf2a6e2277354e7e8f369a20d881891 (diff) | |
| download | linux-276b8c77c3e4838f574d37e25ec8ba52d0418475.tar.bz2 | |
Merge tag 'nfc-next-4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
Samuel Ortiz says:
====================
NFC 4.8 pull request
This is the first NFC pull request for 4.8. We have:
- A fairly large NFC digital stack patchset:
* RTOX fixes.
* Proper DEP RWT support.
* ACK and NACK PDUs handling fixes, in both initiator
and target modes.
* A few memory leak fixes.
- A conversion of the nfcsim driver to use the digital stack.
The driver supports the DEP protocol in both NFC-A and NFC-F.
- Error injection through debugfs for the nfcsim driver.
- Improvements to the port100 driver for the Sony USB chipset, in
particular to the command abort and cancellation code paths.
- A few minor fixes for the pn533, trf7970a and fdp drivers.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/nfc/trf7970a.c')
| -rw-r--r-- | drivers/nfc/trf7970a.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/nfc/trf7970a.c b/drivers/nfc/trf7970a.c index 10842b7051b3..26c9dbbccb0c 100644 --- a/drivers/nfc/trf7970a.c +++ b/drivers/nfc/trf7970a.c @@ -1048,6 +1048,10 @@ static int trf7970a_init(struct trf7970a *trf) if (ret) goto err_out; + ret = trf7970a_write(trf, TRF7970A_NFC_TARGET_LEVEL, 0); + if (ret) + goto err_out; + usleep_range(1000, 2000); trf->chip_status_ctrl &= ~TRF7970A_CHIP_STATUS_RF_ON; |