shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 11:50:43 +09:00
Code Issues Packages Projects Releases Wiki Activity

rk30:phone loquat:Solve the first reported shutdown failure

Browse Source
This commit is contained in:
张晴
2012-05-11 13:05:50 +08:00
parent ac71fcfc44
commit 08fbf78002
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/input/misc/twl6030-pwrbutton.c
View File

@@ -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;

8
drivers/mfd/twl-core.c
View File

@@ -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");
}
}