From d5a6f8f8eae311c95208c8b3ffb74b9d762d5e5e Mon Sep 17 00:00:00 2001
From: Bing Zhao <bzhao@marvell.com>
Date: Wed, 3 Mar 2010 14:37:35 -0800
Subject: [PATCH] --- yaml --- r: 194875 b: refs/heads/master c:
 903c843773a18e061817dd7a1a5c28dd41a3bf97 h: refs/heads/master i:   194873:
 fa52cfd1658804d261ba91241b9e8ab4cb200bc7   194871:
 df7b45613a48c19370797493efd3d3fc95600bc9 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/bluetooth/btmrvl_drv.h  | 5 ++++-
 trunk/drivers/bluetooth/btmrvl_main.c | 6 ++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 0e3d915a1f9e..a7099d25fcac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31f085fea891d5972e994dfb423231a3d4d60a8a
+refs/heads/master: 903c843773a18e061817dd7a1a5c28dd41a3bf97
diff --git a/trunk/drivers/bluetooth/btmrvl_drv.h b/trunk/drivers/bluetooth/btmrvl_drv.h
index 204727586ee9..da68c62a22cc 100644
--- a/trunk/drivers/bluetooth/btmrvl_drv.h
+++ b/trunk/drivers/bluetooth/btmrvl_drv.h
@@ -88,8 +88,11 @@ struct btmrvl_private {
 #define BT_CMD_HOST_SLEEP_ENABLE	0x5A
 #define BT_CMD_MODULE_CFG_REQ		0x5B
 
-/* Sub-commands: Module Bringup/Shutdown Request */
+/* Sub-commands: Module Bringup/Shutdown Request/Response */
 #define MODULE_BRINGUP_REQ		0xF1
+#define MODULE_BROUGHT_UP		0x00
+#define MODULE_ALREADY_UP		0x0C
+
 #define MODULE_SHUTDOWN_REQ		0xF2
 
 #define BT_EVENT_POWER_STATE		0x20
diff --git a/trunk/drivers/bluetooth/btmrvl_main.c b/trunk/drivers/bluetooth/btmrvl_main.c
index 49ec89cd354c..87d0d3d5ae54 100644
--- a/trunk/drivers/bluetooth/btmrvl_main.c
+++ b/trunk/drivers/bluetooth/btmrvl_main.c
@@ -112,8 +112,10 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb)
 	case BT_CMD_MODULE_CFG_REQ:
 		if (priv->btmrvl_dev.sendcmdflag &&
 				event->data[1] == MODULE_BRINGUP_REQ) {
-			BT_DBG("EVENT:%s", (event->data[2]) ?
-				"Bring-up failed" : "Bring-up succeed");
+			BT_DBG("EVENT:%s",
+				((event->data[2] == MODULE_BROUGHT_UP) ||
+				(event->data[2] == MODULE_ALREADY_UP)) ?
+				"Bring-up succeed" : "Bring-up failed");
 		} else if (priv->btmrvl_dev.sendcmdflag &&
 				event->data[1] == MODULE_SHUTDOWN_REQ) {
 			BT_DBG("EVENT:%s", (event->data[2]) ?