projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
[cascardo/linux.git]
/
arch
/
arm
/
mach-pxa
/
sharpsl_pm.c
diff --git
a/arch/arm/mach-pxa/sharpsl_pm.c
b/arch/arm/mach-pxa/sharpsl_pm.c
index
b80eab9
..
249b7bd
100644
(file)
--- a/
arch/arm/mach-pxa/sharpsl_pm.c
+++ b/
arch/arm/mach-pxa/sharpsl_pm.c
@@
-744,7
+744,7
@@
static int sharpsl_off_charge_battery(void)
time = RCNR;
while (1) {
/* Check if any wakeup event had occurred */
- if (sharpsl_pm.machinfo->charger_wakeup()
!= 0
)
+ if (sharpsl_pm.machinfo->charger_wakeup())
return 0;
/* Check for timeout */
if ((RCNR - time) > SHARPSL_WAIT_CO_TIME)