---

yaml --- r: 291037 b: refs/heads/master c: db99b5f h: refs/heads/master i: 291035: aa48230 v: v3
git-mirror · Feb 23, 2012 · 5516130 · 5516130
1 parent f2df57a
commit 5516130
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 490c5baba7a5ad80782d5eb778638d1cfc8d70ce
+refs/heads/master: db99b5fc77e6cec47d80703b471f1efe04527d2f
diff --git a/trunk/net/bluetooth/hci_event.c b/trunk/net/bluetooth/hci_event.c
@@ -227,7 +227,8 @@ static void hci_cc_read_local_name(struct hci_dev *hdev, struct sk_buff *skb)
 	if (rp->status)
 		return;
 
-	memcpy(hdev->dev_name, rp->name, HCI_MAX_NAME_LENGTH);
+	if (test_bit(HCI_SETUP, &hdev->dev_flags))
+		memcpy(hdev->dev_name, rp->name, HCI_MAX_NAME_LENGTH);
 }
 
 static void hci_cc_write_auth_enable(struct hci_dev *hdev, struct sk_buff *skb)