Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[karo-tx-linux.git] / drivers / bluetooth / btmrvl_sdio.c

diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
index b9a811900f6ab534087e17f3726c840a8afdb34e..b9978a7ba0cc9b9883d2bdd95168f81408f6cc60 100644 (file)
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -1071,8 +1071,6 @@ static int btmrvl_sdio_download_fw(struct btmrvl_sdio_card *card)
                }
        }
 
-       sdio_release_host(card->func);
-
        /*
         * winner or not, with this test the FW synchronizes when the
         * module can continue its initialization
@@ -1082,6 +1080,8 @@ static int btmrvl_sdio_download_fw(struct btmrvl_sdio_card *card)
                return -ETIMEDOUT;
        }
 
+       sdio_release_host(card->func);
+
        return 0;
 
 done:
@@ -1376,8 +1376,7 @@ done:
 
        /* fw_dump_data will be free in device coredump release function
           after 5 min*/
-       dev_coredumpv(&priv->btmrvl_dev.hcidev->dev, fw_dump_data,
-                     fw_dump_len, GFP_KERNEL);
+       dev_coredumpv(&card->func->dev, fw_dump_data, fw_dump_len, GFP_KERNEL);
        BT_INFO("== btmrvl firmware dump to /sys/class/devcoredump end");
 }