git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-v3.7' of git://git.infradead.org/battery-2.6
[pandora-kernel.git]
/
drivers
/
power
/
wm97xx_battery.c
diff --git
a/drivers/power/wm97xx_battery.c
b/drivers/power/wm97xx_battery.c
index
0ba331a
..
e128a81
100644
(file)
--- a/
drivers/power/wm97xx_battery.c
+++ b/
drivers/power/wm97xx_battery.c
@@
-146,7
+146,7
@@
static irqreturn_t wm97xx_chrg_irq(int irq, void *data)
#ifdef CONFIG_PM
static int wm97xx_bat_suspend(struct device *dev)
{
- flush_work
_sync
(&bat_work);
+ flush_work(&bat_work);
return 0;
}