diff mbox series

[net] net: nfc: nci: fix the wrong NCI_CORE_INIT parameters

Message ID 20210118205522.317087-1-bongsu.jeon@samsung.com
State New
Headers show
Series [net] net: nfc: nci: fix the wrong NCI_CORE_INIT parameters | expand

Commit Message

Bongsu Jeon Jan. 18, 2021, 8:55 p.m. UTC
From: Bongsu Jeon <bongsu.jeon@samsung.com>

Fix the code because NCI_CORE_INIT_CMD includes two parameters in NCI2.0
but there is no parameters in NCI1.x.

Signed-off-by: Bongsu Jeon <bongsu.jeon@samsung.com>
---
 net/nfc/nci/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jakub Kicinski Jan. 18, 2021, 9:01 p.m. UTC | #1
On Tue, 19 Jan 2021 05:55:22 +0900 Bongsu Jeon wrote:
> From: Bongsu Jeon <bongsu.jeon@samsung.com>
> 
> Fix the code because NCI_CORE_INIT_CMD includes two parameters in NCI2.0
> but there is no parameters in NCI1.x.
> 
> Signed-off-by: Bongsu Jeon <bongsu.jeon@samsung.com>

What's the Fixes tag for this change?
Bongsu Jeon Jan. 18, 2021, 9:19 p.m. UTC | #2
On Tue, Jan 19, 2021 at 6:01 AM Jakub Kicinski <kuba@kernel.org> wrote:
>
> On Tue, 19 Jan 2021 05:55:22 +0900 Bongsu Jeon wrote:
> > From: Bongsu Jeon <bongsu.jeon@samsung.com>
> >
> > Fix the code because NCI_CORE_INIT_CMD includes two parameters in NCI2.0
> > but there is no parameters in NCI1.x.
> >
> > Signed-off-by: Bongsu Jeon <bongsu.jeon@samsung.com>
>
> What's the Fixes tag for this change?
Sorry to miss the Fixes tag.
This is the Fixes tag ( Fixes: bcd684aace34 ("net/nfc/nci: Support NCI
2.x initial sequence") )
Could I resend this patch after adding that tag?
patchwork-bot+netdevbpf@kernel.org Jan. 20, 2021, 1 a.m. UTC | #3
Hello:

This patch was applied to netdev/net.git (refs/heads/master):

On Tue, 19 Jan 2021 05:55:22 +0900 you wrote:
> From: Bongsu Jeon <bongsu.jeon@samsung.com>

> 

> Fix the code because NCI_CORE_INIT_CMD includes two parameters in NCI2.0

> but there is no parameters in NCI1.x.

> 

> Signed-off-by: Bongsu Jeon <bongsu.jeon@samsung.com>

> 

> [...]


Here is the summary with links:
  - [net] net: nfc: nci: fix the wrong NCI_CORE_INIT parameters
    https://git.kernel.org/netdev/net/c/4964e5a1e080

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
Bongsu Jeon Jan. 20, 2021, 9:54 a.m. UTC | #4
On Wed, Jan 20, 2021 at 10:00 AM <patchwork-bot+netdevbpf@kernel.org> wrote:
>

> Hello:

>

> This patch was applied to netdev/net.git (refs/heads/master):

>

> On Tue, 19 Jan 2021 05:55:22 +0900 you wrote:

> > From: Bongsu Jeon <bongsu.jeon@samsung.com>

> >

> > Fix the code because NCI_CORE_INIT_CMD includes two parameters in NCI2.0

> > but there is no parameters in NCI1.x.

> >

> > Signed-off-by: Bongsu Jeon <bongsu.jeon@samsung.com>

> >

> > [...]

>

> Here is the summary with links:

>   - [net] net: nfc: nci: fix the wrong NCI_CORE_INIT parameters

>     https://git.kernel.org/netdev/net/c/4964e5a1e080

>

> You are awesome, thank you!

> --

> Deet-doot-dot, I am a bot.

> https://korg.docs.kernel.org/patchwork/pwbot.html

>

>


Could you merge this patch to net-next repo??
NCI selftest that i will send will fail if this patch isn't merged.
Jakub Kicinski Jan. 20, 2021, 4:58 p.m. UTC | #5
On Wed, 20 Jan 2021 18:54:17 +0900 Bongsu Jeon wrote:
> On Wed, Jan 20, 2021 at 10:00 AM <patchwork-bot+netdevbpf@kernel.org> wrote:

> > This patch was applied to netdev/net.git (refs/heads/master):

> >

> > On Tue, 19 Jan 2021 05:55:22 +0900 you wrote:  

> > > From: Bongsu Jeon <bongsu.jeon@samsung.com>

> > >

> > > Fix the code because NCI_CORE_INIT_CMD includes two parameters in NCI2.0

> > > but there is no parameters in NCI1.x.

> > >

> > > Signed-off-by: Bongsu Jeon <bongsu.jeon@samsung.com>

> 

> Could you merge this patch to net-next repo??

> NCI selftest that i will send will fail if this patch isn't merged.


It happens periodically, should happen today or tomorrow.
diff mbox series

Patch

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,