From dcc1cdf303628385a56e3f41106c6411f30aaa12 Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@intel.com>
Date: Wed, 22 Feb 2012 21:46:22 +0200
Subject: [PATCH] --- yaml --- r: 291040 b: refs/heads/master c:
 27fcc362297b8e838a929c947b82eabb3f4b7591 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/bluetooth/mgmt.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 85d6928cb54a..0e29dbc13cbb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7bdaae4a4bc075cf73ab9c3a531b7229caa1f49e
+refs/heads/master: 27fcc362297b8e838a929c947b82eabb3f4b7591
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
index ee57edbb13ec..6850a8b46c62 100644
--- a/trunk/net/bluetooth/mgmt.c
+++ b/trunk/net/bluetooth/mgmt.c
@@ -648,6 +648,7 @@ static int read_controller_info(struct sock *sk, u16 index)
 	memcpy(rp.dev_class, hdev->dev_class, 3);
 
 	memcpy(rp.name, hdev->dev_name, sizeof(hdev->dev_name));
+	memcpy(rp.short_name, hdev->short_name, sizeof(hdev->short_name));
 
 	hci_dev_unlock(hdev);
 	hci_dev_put(hdev);