From 08fbf780020cad1bfa202fb42ee513324ede4e59 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E5=BC=A0=E6=99=B4?= Date: Fri, 11 May 2012 13:05:50 +0800 Subject: [PATCH] rk30:phone loquat:Solve the first reported shutdown failure --- drivers/input/misc/twl6030-pwrbutton.c | 6 +++--- drivers/mfd/twl-core.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/input/misc/twl6030-pwrbutton.c b/drivers/input/misc/twl6030-pwrbutton.c index b4ba14e13cce..e8efb64a93d2 100755 --- a/drivers/input/misc/twl6030-pwrbutton.c +++ b/drivers/input/misc/twl6030-pwrbutton.c @@ -92,10 +92,10 @@ static irqreturn_t powerbutton_irq(int irq, void *_pwr) input_report_key(pwr->input_dev, pwr->report_key, pwr_val); input_sync(pwr->input_dev); - msleep(20); + // msleep(20); - input_report_key(pwr->input_dev, pwr->report_key, !pwr_val); - input_sync(pwr->input_dev); + // input_report_key(pwr->input_dev, pwr->report_key, !pwr_val); + // input_sync(pwr->input_dev); } else push_release_flag = 0; diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c index be9c6ac119e0..a53734536ac8 100755 --- a/drivers/mfd/twl-core.c +++ b/drivers/mfd/twl-core.c @@ -137,7 +137,7 @@ /* Last - for index max*/ #define TWL4030_MODULE_LAST TWL4030_MODULE_SECURED_REG -#define TWL6030_MODULE_LAST TWL6030_MODULE_SLAVE_RES //xsf +//#define TWL6030_MODULE_LAST TWL6030_MODULE_SLAVE_RES //xsf #define TWL6030_MODULE_LAST TWL_MODULE_PM_DVS //add #define TWL_NUM_SLAVES 4 @@ -1329,7 +1329,7 @@ static void clocks_init(struct device *dev, #ifdef CONFIG_PM static int twl_suspend(struct i2c_client *client, pm_message_t mesg) -{ +{ return irq_set_irq_wake(client->irq, 1); } @@ -1484,14 +1484,14 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id) if (pdata && pdata->pre_init) { ret = pdata->pre_init(); if (ret != 0) { - printk(" tps80032 pre_init() failed: %d\n"); + printk(" tps80032 pre_init() failed\n"); } } if (pdata && pdata->set_init) { ret = pdata->set_init(); if (ret != 0) { - printk(" tps80032 set_init() failed: %d\n"); + printk(" tps80032 set_init() failed\n"); } } -- 2.34.1