From 551613032b4d5a97424d5385e5e08f7b32a755a3 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Wed, 22 Feb 2012 20:14:22 +0200 Subject: [PATCH] --- yaml --- r: 291037 b: refs/heads/master c: db99b5fc77e6cec47d80703b471f1efe04527d2f h: refs/heads/master i: 291035: aa4823067d5fa856e6b331282d2471ffafbe6221 v: v3 --- [refs] | 2 +- trunk/net/bluetooth/hci_event.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 71775ed8e74a..03493e3240af 100644 --- 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 index c79ffb955554..9917fe3d1d18 100644 --- 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)