From b7290cc9c7812d2dd3f516a470d7e942c516d597 Mon Sep 17 00:00:00 2001
From: Johan Hovold <jhovold@gmail.com>
Date: Thu, 15 Mar 2012 14:48:40 +0100
Subject: [PATCH] --- yaml --- r: 299030 b: refs/heads/master c:
 33b69bf80a3704d45341928e4ff68b6ebd470686 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/bluetooth/hci_ldisc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1292b23511d4..f5affd9f15d1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07c0ea874d43c299d185948452945a361052b6e3
+refs/heads/master: 33b69bf80a3704d45341928e4ff68b6ebd470686
diff --git a/trunk/drivers/bluetooth/hci_ldisc.c b/trunk/drivers/bluetooth/hci_ldisc.c
index fd5adb408f44..98a8c05d4f23 100644
--- a/trunk/drivers/bluetooth/hci_ldisc.c
+++ b/trunk/drivers/bluetooth/hci_ldisc.c
@@ -299,11 +299,11 @@ static void hci_uart_tty_close(struct tty_struct *tty)
 			hci_uart_close(hdev);
 
 		if (test_and_clear_bit(HCI_UART_PROTO_SET, &hu->flags)) {
-			hu->proto->close(hu);
 			if (hdev) {
 				hci_unregister_dev(hdev);
 				hci_free_dev(hdev);
 			}
+			hu->proto->close(hu);
 		}
 
 		kfree(hu);