staging: rtl8723au: rtl8732au_hal_init.c: Use rtl8723au_BT_coexist() to pick firmware...

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
index 970b5858aad011f074ffab43c379e0d8fc9343b6..dc97885669a387431984eef6abbcc6ca4ec70bac 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
@@ -309,15 +309,15 @@ int rtl8723a_FirmwareDownload(struct rtw_adapter *padapter)
                        DBG_8723A(" Rtl8723_FwUMCBCutImageArrayWithoutBT for "
                                  "RTL8723A B CUT\n");
                } else {
-#ifdef CONFIG_8723AU_BT_COEXIST
-                       fw_name = "rtlwifi/rtl8723aufw_B.bin";
-                       DBG_8723A(" Rtl8723_FwUMCBCutImageArrayWithBT for "
-                                 "RTL8723A B CUT\n");
-#else
-                       fw_name = "rtlwifi/rtl8723aufw_B_NoBT.bin";
-                       DBG_8723A(" Rtl8723_FwUMCBCutImageArrayWithoutBT for "
-                                 "RTL8723A B CUT\n");
-#endif
+                       if (rtl8723a_BT_coexist(padapter)) {
+                               fw_name = "rtlwifi/rtl8723aufw_B.bin";
+                               DBG_8723A(" Rtl8723_FwUMCBCutImageArrayWithBT "
+                                         "for RTL8723A B CUT\n");
+                       } else {
+                               fw_name = "rtlwifi/rtl8723aufw_B_NoBT.bin";
+                               DBG_8723A(" Rtl8723_FwUMCBCutImageArrayWithout "
+                                         "BT for RTL8723A B CUT\n");
+                       }
                }
        } else {
                /*  <Roger_TODO> We should download proper RAM Code here