Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 903c8437 authored by Bing Zhao's avatar Bing Zhao Committed by Marcel Holtmann
Browse files

Bluetooth: Decode btmrvl MODULE_BRINGUP_REG response correctly 



The MODULE_BRINGUP_REQ command response returns success with
either 0x00 or 0x0c.

Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 31f085fe

drivers/bluetooth/btmrvl_drv.h

+4 −1
Original line number Diff line number Diff line
@@ -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

drivers/bluetooth/btmrvl_main.c

+4 −2
Original line number Diff line number Diff line
@@ -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]) ?