Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[cascardo/linux.git] / drivers / bluetooth / btmrvl_sdio.c

diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
index 5b33b85..f36defa 100644 (file)
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -535,7 +535,7 @@ static int btmrvl_sdio_card_to_host(struct btmrvl_private *priv)
                break;
 
        default:
-               BT_ERR("Unknow packet type:%d", type);
+               BT_ERR("Unknown packet type:%d", type);
                print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, payload,
                                                blksz * buf_block_len);
 
@@ -930,6 +930,8 @@ static int btmrvl_sdio_probe(struct sdio_func *func,
        priv->hw_wakeup_firmware = btmrvl_sdio_wakeup_fw;
 
        btmrvl_send_module_cfg_cmd(priv, MODULE_BRINGUP_REQ);
+       priv->btmrvl_dev.psmode = 1;
+       btmrvl_enable_ps(priv);
 
        return 0;
 
@@ -1001,3 +1003,5 @@ MODULE_AUTHOR("Marvell International Ltd.");
 MODULE_DESCRIPTION("Marvell BT-over-SDIO driver ver " VERSION);
 MODULE_VERSION(VERSION);
 MODULE_LICENSE("GPL v2");
+MODULE_FIRMWARE("sd8688_helper.bin");
+MODULE_FIRMWARE("sd8688.bin");