projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f6a2e94
)
net: nfc: nci: fix the wrong NCI_CORE_INIT parameters
author
Bongsu Jeon
<bongsu.jeon@samsung.com>
Mon, 18 Jan 2021 20:55:22 +0000
(
05:55
+0900)
committer
Jakub Kicinski
<kuba@kernel.org>
Wed, 20 Jan 2021 00:49:28 +0000
(16:49 -0800)
Fix the code because NCI_CORE_INIT_CMD includes two parameters in NCI2.0
but there is no parameters in NCI1.x.
Fixes: bcd684aace34 ("net/nfc/nci: Support NCI 2.x initial sequence")
Signed-off-by: Bongsu Jeon <bongsu.jeon@samsung.com>
Link:
https://lore.kernel.org/r/20210118205522.317087-1-bongsu.jeon@samsung.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/nfc/nci/core.c
patch
|
blob
|
history
diff --git
a/net/nfc/nci/core.c
b/net/nfc/nci/core.c
index e64727e1a72f9c2ffb830de8492b1e64d2d7963b..02a1f13f07980fd16bef7008a184c891369f3626 100644
(file)
--- a/
net/nfc/nci/core.c
+++ b/
net/nfc/nci/core.c
@@
-508,7
+508,7
@@
static int nci_open_device(struct nci_dev *ndev)
};
unsigned long opt = 0;
- if (
!(ndev->nci_ver & NCI_VER_2_MASK)
)
+ if (
ndev->nci_ver & NCI_VER_2_MASK
)
opt = (unsigned long)&nci_init_v2_cmd;
rc = __nci_request(ndev, nci_init_req, opt,