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 'stable/bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
sh
/
drivers
/
push-switch.c
diff --git
a/arch/sh/drivers/push-switch.c
b/arch/sh/drivers/push-switch.c
index
7b42c24
..
afc2455
100644
(file)
--- a/
arch/sh/drivers/push-switch.c
+++ b/
arch/sh/drivers/push-switch.c
@@
-107,7
+107,7
@@
static int switch_drv_remove(struct platform_device *pdev)
device_remove_file(&pdev->dev, &dev_attr_switch);
platform_set_drvdata(pdev, NULL);
- flush_
scheduled_work(
);
+ flush_
work_sync(&psw->work
);
del_timer_sync(&psw->debounce);
free_irq(irq, pdev);