From 2d65bc3d70819367593e90b1ca0ed7c6915a7425 Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@intel.com>
Date: Sun, 20 Jan 2013 14:27:13 +0200
Subject: [PATCH] --- yaml --- r: 352249 b: refs/heads/master c:
 4ae14301c3b180adaf6b72285499e7404819a023 h: refs/heads/master i:   352247:
 f582945b540e42430204a9ff2b0e6c2b6efb8d6d v: v3

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

diff --git a/[refs] b/[refs]
index e27ae4f681c9..9faf898ec78d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f950a30e2433f049c17fc47caced1397d25373a6
+refs/heads/master: 4ae14301c3b180adaf6b72285499e7404819a023
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
index 36b23101d651..d9b042efbf42 100644
--- a/trunk/net/bluetooth/mgmt.c
+++ b/trunk/net/bluetooth/mgmt.c
@@ -1519,6 +1519,10 @@ static int load_link_keys(struct sock *sk, struct hci_dev *hdev, void *data,
 				  MGMT_STATUS_INVALID_PARAMS);
 	}
 
+	if (cp->debug_keys != 0x00 && cp->debug_keys != 0x01)
+		return cmd_status(sk, hdev->id, MGMT_OP_LOAD_LINK_KEYS,
+				  MGMT_STATUS_INVALID_PARAMS);
+
 	BT_DBG("%s debug_keys %u key_count %u", hdev->name, cp->debug_keys,
 	       key_count);