From 9bcdee58ab1f36c4c4e0fdb2093b82fae24c3d84 Mon Sep 17 00:00:00 2001
From: Eric Lapuyade <eric.lapuyade@linux.intel.com>
Date: Wed, 17 Oct 2012 16:47:13 +0200
Subject: [PATCH] --- yaml --- r: 341500 b: refs/heads/master c:
 07887e92205c5808820de0be53bf326b4019d060 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/net/nfc/hci/command.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 72207740dde9..78b25086110a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac46ba4384d2c44c56702d0da591696045fba682
+refs/heads/master: 07887e92205c5808820de0be53bf326b4019d060
diff --git a/trunk/net/nfc/hci/command.c b/trunk/net/nfc/hci/command.c
index 07659cfd6d7b..7d99410e6c1a 100644
--- a/trunk/net/nfc/hci/command.c
+++ b/trunk/net/nfc/hci/command.c
@@ -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;