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 branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[pandora-kernel.git]
/
drivers
/
char
/
sonypi.c
diff --git
a/drivers/char/sonypi.c
b/drivers/char/sonypi.c
index
73f66d0
..
79e36c8
100644
(file)
--- a/
drivers/char/sonypi.c
+++ b/
drivers/char/sonypi.c
@@
-1434,7
+1434,7
@@
static int __devexit sonypi_remove(struct platform_device *dev)
sonypi_disable();
synchronize_irq(sonypi_device.irq);
sonypi_disable();
synchronize_irq(sonypi_device.irq);
- flush_
scheduled_work(
);
+ flush_
work_sync(&sonypi_device.input_work
);
if (useinput) {
input_unregister_device(sonypi_device.input_key_dev);
if (useinput) {
input_unregister_device(sonypi_device.input_key_dev);