redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

NFC: Fix hci_connect_gate() when a pre-opened pipe is passed

Browse source 
In some cases, pre-opened pipes don't stay open when a clear all pipes
command is sent. They stay created however. Therefore, one can never
assume that such a pipe is already open. As re-opening a pipe seems not
to be a problem, we do that now.

Signed-off-by: Eric Lapuyade <eric.lapuyade@intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Eric Lapuyade 2012-10-17 16:47:13 +02:00 committed by Samuel Ortiz
parent ac46ba4384
commit 07887e9220
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/nfc/hci/command.c
View file

@ -344,7 +344,7 @@ int nfc_hci_connect_gate(struct nfc_hci_dev *hdev, u8 dest_host, u8 dest_gate,
return -EADDRINUSE; return -EADDRINUSE;
if (pipe != NFC_HCI_INVALID_PIPE) if (pipe != NFC_HCI_INVALID_PIPE)
goto pipe_is_open; goto open_pipe;
switch (dest_gate) { switch (dest_gate) {
case NFC_HCI_LINK_MGMT_GATE: case NFC_HCI_LINK_MGMT_GATE:
@ -361,6 +361,7 @@ int nfc_hci_connect_gate(struct nfc_hci_dev *hdev, u8 dest_host, u8 dest_gate,
break; break;
} }
open_pipe:
r = nfc_hci_open_pipe(hdev, pipe); r = nfc_hci_open_pipe(hdev, pipe);
if (r < 0) { if (r < 0) {
if (pipe_created) if (pipe_created)
@ -371,7 +372,6 @@ int nfc_hci_connect_gate(struct nfc_hci_dev *hdev, u8 dest_host, u8 dest_gate,
return r; return r;
} }
pipe_is_open:
hdev->gate2pipe[dest_gate] = pipe; hdev->gate2pipe[dest_gate] = pipe;
return 0; return 0;