From 8a5ad575fa49d2f30b5c8f2daf4768cbefd39823 Mon Sep 17 00:00:00 2001
From: Andre Guedes <andre.guedes@openbossa.org>
Date: Fri, 8 Mar 2013 11:20:17 -0300
Subject: [PATCH] --- yaml --- r: 369015 b: refs/heads/master c:
 e348fe6bbab85c513816d2536ffabac4be016442 h: refs/heads/master i:   369013:
 c78d526d7181b20567fec1cc164317a094e87031   369011:
 40ff33bcc88dc6624b00e42c21d91c47cb0cc8b0   369007:
 378f9b72a6244c6425c37b542720eedfcdfb8537 v: v3

---
 [refs]                                 | 2 +-
 trunk/include/net/bluetooth/hci_core.h | 2 +-
 trunk/net/bluetooth/hci_core.c         | 6 ++----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 8c28be75d902..dbb7bba7eeab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d73e0342fd9bf500583868906325d42c4d2bf6f
+refs/heads/master: e348fe6bbab85c513816d2536ffabac4be016442
diff --git a/trunk/include/net/bluetooth/hci_core.h b/trunk/include/net/bluetooth/hci_core.h
index 332ee5099a52..d6c32561fc02 100644
--- a/trunk/include/net/bluetooth/hci_core.h
+++ b/trunk/include/net/bluetooth/hci_core.h
@@ -1051,7 +1051,7 @@ struct hci_request {
 
 void hci_req_init(struct hci_request *req, struct hci_dev *hdev);
 int hci_req_run(struct hci_request *req, hci_req_complete_t complete);
-int hci_req_add(struct hci_request *req, u16 opcode, u32 plen, void *param);
+void hci_req_add(struct hci_request *req, u16 opcode, u32 plen, void *param);
 void hci_req_cmd_complete(struct hci_dev *hdev, u16 opcode, u8 status);
 void hci_req_cmd_status(struct hci_dev *hdev, u16 opcode, u8 status);
 
diff --git a/trunk/net/bluetooth/hci_core.c b/trunk/net/bluetooth/hci_core.c
index b432baafdf12..1c678757c83a 100644
--- a/trunk/net/bluetooth/hci_core.c
+++ b/trunk/net/bluetooth/hci_core.c
@@ -2529,7 +2529,7 @@ int hci_send_cmd(struct hci_dev *hdev, __u16 opcode, __u32 plen, void *param)
 }
 
 /* Queue a command to an asynchronous HCI request */
-int hci_req_add(struct hci_request *req, u16 opcode, u32 plen, void *param)
+void hci_req_add(struct hci_request *req, u16 opcode, u32 plen, void *param)
 {
 	struct hci_dev *hdev = req->hdev;
 	struct sk_buff *skb;
@@ -2541,15 +2541,13 @@ int hci_req_add(struct hci_request *req, u16 opcode, u32 plen, void *param)
 		BT_ERR("%s no memory for command (opcode 0x%4.4x)",
 		       hdev->name, opcode);
 		req->err = -ENOMEM;
-		return -ENOMEM;
+		return;
 	}
 
 	if (skb_queue_empty(&req->cmd_q))
 		bt_cb(skb)->req.start = true;
 
 	skb_queue_tail(&req->cmd_q, skb);
-
-	return 0;
 }
 
 /* Get data from the previously sent command */