From c828864a4df6a3b9da6b8edb12567a693ec10121 Mon Sep 17 00:00:00 2001 From: CMY Date: Sat, 2 Jun 2012 17:25:20 +0800 Subject: [PATCH] fixed bug: build failed if disable BT_WAKE_HOST_SUPPORT --- arch/arm/mach-rk30/board-rk30-sdk-rfkill.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-rk30/board-rk30-sdk-rfkill.c b/arch/arm/mach-rk30/board-rk30-sdk-rfkill.c index 8045653033b6..f5276d6334be 100755 --- a/arch/arm/mach-rk30/board-rk30-sdk-rfkill.c +++ b/arch/arm/mach-rk30/board-rk30-sdk-rfkill.c @@ -139,6 +139,7 @@ extern int rk29sdk_wifi_power_state; struct bt_ctrl gBtCtrl; struct timer_list bt_sleep_tl; +void bcm4325_sleep(unsigned long bSleep); #if BT_WAKE_HOST_SUPPORT void resetBtHostSleepTimer(void) @@ -170,8 +171,6 @@ static void timer_hostSleep(unsigned long arg) btWakeupHostUnlock(); } -void bcm4325_sleep(unsigned long bSleep); - #ifdef CONFIG_PM static irqreturn_t bcm4329_wake_host_irq(int irq, void *dev) { @@ -250,6 +249,19 @@ static int bcm4329_rfkill_resume(struct platform_device *pdev) #define bcm4329_rfkill_resume NULL #endif +#else +#ifdef CONFIG_PM +static int bcm4329_rfkill_suspend(struct platform_device *pdev, pm_message_t state) +{ +#ifdef CONFIG_BT_AUTOSLEEP + bcm4325_sleep(1); +#endif + return 0; +} +#else +#define bcm4329_rfkill_suspend NULL +#endif +#define bcm4329_rfkill_resume NULL #endif void bcm4325_sleep(unsigned long bSleep) @@ -408,10 +420,8 @@ static struct platform_driver bcm4329_rfkill_driver = { .name = "rk29sdk_rfkill", .owner = THIS_MODULE, }, -#if BT_WAKE_HOST_SUPPORT .suspend = bcm4329_rfkill_suspend, .resume = bcm4329_rfkill_resume, -#endif }; /* -- 2.34.1