From: Bongsu Jeon <bongsu.jeon@samsung.com>
Date: Mon, 18 Jan 2021 20:55:22 +0000 (+0900)
Subject: net: nfc: nci: fix the wrong NCI_CORE_INIT parameters
X-Git-Tag: howlett/maple/20220722_2~3974^2~10
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4964e5a1e080f785f5518b402a9e48c527fe6cbd;p=users%2Fjedix%2Flinux-maple.git

net: nfc: nci: fix the wrong NCI_CORE_INIT parameters

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>
---

diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index e64727e1a72f..02a1f13f0798 100644
--- 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,