summaryrefslogtreecommitdiff
path: root/drivers/power/bq27xxx_battery.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2016-07-13 18:01:34 +0300
committerThomas Gleixner <tglx@linutronix.de>2016-07-13 18:01:51 +0300
commit54f54496779661678d906b57e4cba48239ab7c9b (patch)
treefeb06330bfa37391a5502e8dc6dfdd58b46b56fb /drivers/power/bq27xxx_battery.c
parent92d21ac74a9e3c09b0b01c764e530657e4c85c49 (diff)
parent1d661bf5327a2c059ec967f850e89362e637f4e6 (diff)
downloadlinux-54f54496779661678d906b57e4cba48239ab7c9b.tar.xz
Merge branch 'timers/core' into smp/hotplug to pick up dependencies
Diffstat (limited to 'drivers/power/bq27xxx_battery.c')
-rw-r--r--drivers/power/bq27xxx_battery.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/power/bq27xxx_battery.c b/drivers/power/bq27xxx_battery.c
index 45f6ebf88df6..e90b3f307e0f 100644
--- a/drivers/power/bq27xxx_battery.c
+++ b/drivers/power/bq27xxx_battery.c
@@ -735,11 +735,8 @@ static void bq27xxx_battery_poll(struct work_struct *work)
bq27xxx_battery_update(di);
- if (poll_interval > 0) {
- /* The timer does not have to be accurate. */
- set_timer_slack(&di->work.timer, poll_interval * HZ / 4);
+ if (poll_interval > 0)
schedule_delayed_work(&di->work, poll_interval * HZ);
- }
}
/*