diff options
author | Petri Gynther <pgynther@google.com> | 2014-04-15 16:00:00 -0400 |
---|---|---|
committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2014-04-24 10:55:25 -0400 |
commit | 7125df535183f167a30a6e97ec2ad7f093b185e5 (patch) | |
tree | 4a22994b538561d25fd0efe8cff809c201bd9562 | |
parent | db5966816cd83b8daa1aee38cb1374794f1d8b8e (diff) |
Bluetooth: btmrvl: Fix btmrvl_send_module_cfg_cmd()
Change subcmd parameter from int to u8 to match its use:
btmrvl_send_sync_cmd(priv, BT_CMD_MODULE_CFG_REQ, &subcmd, 1);
Signed-off-by: Petri Gynther <pgynther@google.com>
Reviewed-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
-rw-r--r-- | drivers/bluetooth/btmrvl_drv.h | 2 | ||||
-rw-r--r-- | drivers/bluetooth/btmrvl_main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/bluetooth/btmrvl_drv.h b/drivers/bluetooth/btmrvl_drv.h index 199ff492da26..dc79f88f8717 100644 --- a/drivers/bluetooth/btmrvl_drv.h +++ b/drivers/bluetooth/btmrvl_drv.h | |||
@@ -142,7 +142,7 @@ void btmrvl_interrupt(struct btmrvl_private *priv); | |||
142 | bool btmrvl_check_evtpkt(struct btmrvl_private *priv, struct sk_buff *skb); | 142 | bool btmrvl_check_evtpkt(struct btmrvl_private *priv, struct sk_buff *skb); |
143 | int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb); | 143 | int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb); |
144 | 144 | ||
145 | int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, int subcmd); | 145 | int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, u8 subcmd); |
146 | int btmrvl_send_hscfg_cmd(struct btmrvl_private *priv); | 146 | int btmrvl_send_hscfg_cmd(struct btmrvl_private *priv); |
147 | int btmrvl_enable_ps(struct btmrvl_private *priv); | 147 | int btmrvl_enable_ps(struct btmrvl_private *priv); |
148 | int btmrvl_prepare_command(struct btmrvl_private *priv); | 148 | int btmrvl_prepare_command(struct btmrvl_private *priv); |
diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c index 5c0b9444b5e1..e9dbddb0b8f1 100644 --- a/drivers/bluetooth/btmrvl_main.c +++ b/drivers/bluetooth/btmrvl_main.c | |||
@@ -202,7 +202,7 @@ static int btmrvl_send_sync_cmd(struct btmrvl_private *priv, u16 opcode, | |||
202 | return 0; | 202 | return 0; |
203 | } | 203 | } |
204 | 204 | ||
205 | int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, int subcmd) | 205 | int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, u8 subcmd) |
206 | { | 206 | { |
207 | int ret; | 207 | int ret; |
208 | 208 | ||