diff options
| author | Bing Zhao <bzhao@marvell.com> | 2010-03-03 14:37:36 -0800 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2010-05-10 09:34:03 +0200 |
| commit | 64061607eab7cb146115927cb596de123c542d45 (patch) | |
| tree | c58015f5fc78f6cf553dd976304e0dcf978f7311 /drivers/bluetooth/btmrvl_sdio.c | |
| parent | 903c843773a18e061817dd7a1a5c28dd41a3bf97 (diff) | |
| download | lwn-64061607eab7cb146115927cb596de123c542d45.tar.gz lwn-64061607eab7cb146115927cb596de123c542d45.zip | |
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.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c index 0dba76aa2232..df0773ebd9e4 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, priv->hw_host_to_card = btmrvl_sdio_host_to_card; priv->hw_wakeup_firmware = btmrvl_sdio_wakeup_fw; - btmrvl_send_module_cfg_cmd(priv, MODULE_BRINGUP_REQ); + if (btmrvl_register_hdev(priv)) { + BT_ERR("Register hdev failed!"); + ret = -ENODEV; + goto disable_host_int; + } + priv->btmrvl_dev.psmode = 1; btmrvl_enable_ps(priv); |