Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
net
/
nfc
/
core.c
diff --git
a/kernel/net/nfc/core.c
b/kernel/net/nfc/core.c
index
cff3f16
..
1fe3d3b
100644
(file)
--- a/
kernel/net/nfc/core.c
+++ b/
kernel/net/nfc/core.c
@@
-449,7
+449,7
@@
error:
* @dev: The nfc device that found the target
* @target_idx: index of the target that must be deactivated
*/
* @dev: The nfc device that found the target
* @target_idx: index of the target that must be deactivated
*/
-int nfc_deactivate_target(struct nfc_dev *dev, u32 target_idx)
+int nfc_deactivate_target(struct nfc_dev *dev, u32 target_idx
, u8 mode
)
{
int rc = 0;
{
int rc = 0;
@@
-476,7
+476,7
@@
int nfc_deactivate_target(struct nfc_dev *dev, u32 target_idx)
if (dev->ops->check_presence)
del_timer_sync(&dev->check_pres_timer);
if (dev->ops->check_presence)
del_timer_sync(&dev->check_pres_timer);
- dev->ops->deactivate_target(dev, dev->active_target);
+ dev->ops->deactivate_target(dev, dev->active_target
, mode
);
dev->active_target = NULL;
error:
dev->active_target = NULL;
error: