diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-12 13:14:16 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-12 13:14:16 +1000 |
| commit | 7aed15051424b45449d41f3303bb93cdf130bef9 (patch) | |
| tree | dd42738a3a4518e6cb1bcb6ad707fffa9626d572 /drivers/power | |
| parent | fc5f7f6126abfb7e125b90385795f42d9d562901 (diff) | |
| parent | 9f897631aba5f61f253a5701a5e3121ed798420d (diff) | |
Merge remote-tracking branch 'tip/auto-latest'
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/reset/ltc2952-poweroff.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/power/reset/ltc2952-poweroff.c b/drivers/power/reset/ltc2952-poweroff.c index 1e08195551fe..5f855f99bdfc 100644 --- a/drivers/power/reset/ltc2952-poweroff.c +++ b/drivers/power/reset/ltc2952-poweroff.c @@ -158,7 +158,6 @@ static irqreturn_t ltc2952_poweroff_handler(int irq, void *dev_id) HRTIMER_MODE_REL); } else { hrtimer_cancel(&data->timer_trigger); - /* omitting return value check, timer should have been valid */ } return IRQ_HANDLED; } |