From 5b53fca1abce19dfe2077c4a509bdcf7c449898b Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Wed, 14 Nov 2012 10:10:49 -0800 Subject: [PATCH] --- yaml --- r: 346957 b: refs/heads/master c: f32198176598fffdc8dca65a1a719dd9fba7d581 h: refs/heads/master i: 346955: 0be52210607c83b67ab21a947a9b4b868d0c40dd v: v3 --- [refs] | 2 +- trunk/drivers/input/misc/twl4030-pwrbutton.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index aaca3175ce48..634c4e0c0b97 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ea32387a0c7fb9ca0213fd22b47c5a1ca4c2972 +refs/heads/master: f32198176598fffdc8dca65a1a719dd9fba7d581 diff --git a/trunk/drivers/input/misc/twl4030-pwrbutton.c b/trunk/drivers/input/misc/twl4030-pwrbutton.c index b3dd96d6448b..27c2bc8aa890 100644 --- a/trunk/drivers/input/misc/twl4030-pwrbutton.c +++ b/trunk/drivers/input/misc/twl4030-pwrbutton.c @@ -39,8 +39,7 @@ static irqreturn_t powerbutton_irq(int irq, void *_pwr) int err; u8 value; - err = twl_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &value, - STS_HW_CONDITIONS); + err = twl_i2c_read_u8(TWL_MODULE_PM_MASTER, &value, STS_HW_CONDITIONS); if (!err) { pm_wakeup_event(pwr->dev.parent, 0); input_report_key(pwr, KEY_POWER, value & PWR_PWRON_IRQ);