From: hwg <hwg@rock-chips.com>
Date: Fri, 16 Nov 2012 08:06:57 +0000 (+0800)
Subject: modify rk29sdk_wifi_bt_gpio_control_init control bug
X-Git-Tag: firefly_0821_release~8202
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=933dbc4f6bf523ccfb309f6e0be4c1b1624b0045;p=firefly-linux-kernel-4.4.55.git

modify rk29sdk_wifi_bt_gpio_control_init control bug
---

diff --git a/arch/arm/mach-rk2928/board-rk2928-sdk-sdmmc.c b/arch/arm/mach-rk2928/board-rk2928-sdk-sdmmc.c
index af73f9a1c888..eaa3484f0cbe 100755
--- a/arch/arm/mach-rk2928/board-rk2928-sdk-sdmmc.c
+++ b/arch/arm/mach-rk2928/board-rk2928-sdk-sdmmc.c
@@ -361,12 +361,13 @@ static int rk29sdk_wifi_status_register(void (*callback)(int card_present, void
 #if defined(CONFIG_RTL8192CU) || defined(CONFIG_RTL8188EU) || defined(CONFIG_RT5370)
 static int __init rk29sdk_wifi_bt_gpio_control_init(void)
 {
+#if defined(CONFIG_USB_WIFI_POWER_CONTROLED_BY_GPIO)
     if (gpio_request(RK30SDK_WIFI_GPIO_POWER_N, "wifi_power")) {
            pr_info("%s: request wifi power gpio failed\n", __func__);
            return -1;
     }
     gpio_direction_output(RK30SDK_WIFI_GPIO_POWER_N, !RK30SDK_WIFI_GPIO_POWER_ENABLE_VALUE);
-
+#endif
     pr_info("%s: init finished\n",__func__);
     return 0;
 }