git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'hsi-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
platform
/
olpc
/
olpc-xo15-sci.c
diff --git
a/arch/x86/platform/olpc/olpc-xo15-sci.c
b/arch/x86/platform/olpc/olpc-xo15-sci.c
index 08e350e757dcd189c29e06d4d0b199a2cd920b9f..55130846ac87afe11d50e7bdbcf77b77827838b0 100644
(file)
--- a/
arch/x86/platform/olpc/olpc-xo15-sci.c
+++ b/
arch/x86/platform/olpc/olpc-xo15-sci.c
@@
-83,7
+83,7
@@
static void battery_status_changed(void)
if (psy) {
power_supply_changed(psy);
- p
ut_device(psy->dev
);
+ p
ower_supply_put(psy
);
}
}
@@
-93,7
+93,7
@@
static void ac_status_changed(void)
if (psy) {
power_supply_changed(psy);
- p
ut_device(psy->dev
);
+ p
ower_supply_put(psy
);
}
}