aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth/btmrvl_sdio.c
diff options
context:
space:
mode:
authorBing Zhao <bzhao@marvell.com>2010-03-03 17:37:36 -0500
committerMarcel Holtmann <marcel@holtmann.org>2010-05-10 03:34:03 -0400
commit64061607eab7cb146115927cb596de123c542d45 (patch)
treec58015f5fc78f6cf553dd976304e0dcf978f7311 /drivers/bluetooth/btmrvl_sdio.c
parent903c843773a18e061817dd7a1a5c28dd41a3bf97 (diff)
Bluetooth: Separate btmrvl_register_hdev() from btmrvl_add_card()
Move btmrvl hdev registration code out of btmrvl_add_card(). New function btmrvl_register_hdev() is added. Signed-off-by: Bing Zhao <bzhao@marvell.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth/btmrvl_sdio.c')
-rw-r--r--drivers/bluetooth/btmrvl_sdio.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
index 0dba76aa223..df0773ebd9e 100644
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -931,7 +931,12 @@ static int btmrvl_sdio_probe(struct sdio_func *func,
931 priv->hw_host_to_card = btmrvl_sdio_host_to_card; 931 priv->hw_host_to_card = btmrvl_sdio_host_to_card;
932 priv->hw_wakeup_firmware = btmrvl_sdio_wakeup_fw; 932 priv->hw_wakeup_firmware = btmrvl_sdio_wakeup_fw;
933 933
934 btmrvl_send_module_cfg_cmd(priv, MODULE_BRINGUP_REQ); 934 if (btmrvl_register_hdev(priv)) {
935 BT_ERR("Register hdev failed!");
936 ret = -ENODEV;
937 goto disable_host_int;
938 }
939
935 priv->btmrvl_dev.psmode = 1; 940 priv->btmrvl_dev.psmode = 1;
936 btmrvl_enable_ps(priv); 941 btmrvl_enable_ps(priv);
937 942