From 2c61c584e264291b6326cf24db58e37e92fe1041 Mon Sep 17 00:00:00 2001
From: Andre Guedes <andre.guedes@openbossa.org>
Date: Thu, 23 Feb 2012 18:09:27 -0300
Subject: [PATCH] --- yaml --- r: 291081 b: refs/heads/master c:
 8b90129cc5789a4c65547c91c9a7b1fd3a4d56a4 h: refs/heads/master i:   291079:
 59f1944db823719889277fcde4b76525844f1da3 v: v3

---
 [refs]                     |  2 +-
 trunk/net/bluetooth/mgmt.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2be54c4c8423..d52fe2e9cd69 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1de028ceb54ccd28cc96f1530a195ae1b6a6d5b5
+refs/heads/master: 8b90129cc5789a4c65547c91c9a7b1fd3a4d56a4
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
index abf1adb8bc16..3fcccad75453 100644
--- a/trunk/net/bluetooth/mgmt.c
+++ b/trunk/net/bluetooth/mgmt.c
@@ -2602,12 +2602,18 @@ static int start_discovery(struct sock *sk, u16 index,
 
 	switch (hdev->discovery.type) {
 	case DISCOV_TYPE_BREDR:
-		err = hci_do_inquiry(hdev, INQUIRY_LEN_BREDR);
+		if (lmp_bredr_capable(hdev))
+			err = hci_do_inquiry(hdev, INQUIRY_LEN_BREDR);
+		else
+			err = -ENOTSUPP;
 		break;
 
 	case DISCOV_TYPE_LE:
-		err = hci_le_scan(hdev, LE_SCAN_TYPE, LE_SCAN_INT,
+		if (lmp_host_le_capable(hdev))
+			err = hci_le_scan(hdev, LE_SCAN_TYPE, LE_SCAN_INT,
 					LE_SCAN_WIN, LE_SCAN_TIMEOUT_LE_ONLY);
+		else
+			err = -ENOTSUPP;
 		break;
 
 	case DISCOV_TYPE_INTERLEAVED: