summaryrefslogtreecommitdiff
path: root/drivers/headset_observe
diff options
context:
space:
mode:
author陈金泉 <chenjq@rock-chips.com>2011-11-23 10:43:22 +0800
committer陈金泉 <chenjq@rock-chips.com>2011-11-23 10:43:46 +0800
commitb8a4ab8ff871fc059c9902f3f2683715efc3a9c5 (patch)
tree293f886a27e887f6027e088ea664a644e8d79ee1 /drivers/headset_observe
parent3ed00a8562848a557239e84aac3ddf5bbecd7073 (diff)
change for wm8994
Diffstat (limited to 'drivers/headset_observe')
-rwxr-xr-xdrivers/headset_observe/rk_headset.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/headset_observe/rk_headset.c b/drivers/headset_observe/rk_headset.c
index 9ea5f095fc56..e5b6f6d178ac 100755
--- a/drivers/headset_observe/rk_headset.c
+++ b/drivers/headset_observe/rk_headset.c
@@ -61,8 +61,11 @@
#define enable 1
#define disable 0
-extern int wm8994_set_status(void);
+/*#ifdef CONFIG_SND_SOC_WM8994
+extern int wm8994_set_status(void);
+#endif
+*/
/* headset private data */
struct headset_priv {
struct input_dev *input_dev;
@@ -259,13 +262,13 @@ static void Hook_work(struct work_struct *work)
DBG("Headset is out\n");
goto RE_ERROR;
}
- #ifdef CONFIG_SND_SOC_WM8994
+ /*#ifdef CONFIG_SND_SOC_WM8994
if(wm8994_set_status() < 0)
{
DBG("wm8994 is not set on heatset channel or suspend\n");
goto RE_ERROR;
}
- #endif
+ #endif*/
for(i=0; i<3; i++)
{
level = gpio_get_value(pdata->Hook_gpio);
@@ -326,7 +329,7 @@ static void headset_timer_callback(unsigned long arg)
DBG("Headset is out\n");
goto out;
}
- #ifdef CONFIG_SND_SOC_WM8994
+ /*#ifdef CONFIG_SND_SOC_WM8994
if(wm8994_set_status() < 0)
{
DBG("wm8994 is not set on heatset channel\n");
@@ -334,7 +337,7 @@ static void headset_timer_callback(unsigned long arg)
add_timer(&headset_info->headset_timer);
goto out;
}
- #endif
+ #endif*/
for(i=0; i<3; i++)
{
level = gpio_get_value(pdata->Hook_gpio);