Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07887e92 authored by Eric Lapuyade's avatar Eric Lapuyade Committed by Samuel Ortiz
Browse files

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



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: default avatarEric Lapuyade <eric.lapuyade@intel.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent ac46ba43

net/nfc/hci/command.c

+2 −2
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ int nfc_hci_connect_gate(struct nfc_hci_dev *hdev, u8 dest_host, u8 dest_gate, 
		return -EADDRINUSE;



	if (pipe != NFC_HCI_INVALID_PIPE)

		goto pipe_is_open;

		goto open_pipe;



	switch (dest_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;

	}



open_pipe:

	r = nfc_hci_open_pipe(hdev, pipe);

	if (r < 0) {

		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;

	}



pipe_is_open:

	hdev->gate2pipe[dest_gate] = pipe;



	return 0;