diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 17:41:21 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 17:41:21 +0100 |
| commit | 8dbd2879e33be37adf40f747a5fb80ef1a6cd150 (patch) | |
| tree | c688d7980be8c1c0dbf5e411caaf2c102120102e /kernel/workqueue.c | |
| parent | Merge tag 'omap-for-v3.8/gpmc-signed' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into om... (diff) | |
| download | linux-8dbd2879e33be37adf40f747a5fb80ef1a6cd150.tar.xz linux-8dbd2879e33be37adf40f747a5fb80ef1a6cd150.zip | |
Merge branch 'omap/dt' into next/drivers
Needed for the omap timer changes.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'kernel/workqueue.c')
| -rw-r--r-- | kernel/workqueue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index d951daa0ca9a..042d221d33cc 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -2982,7 +2982,7 @@ bool cancel_delayed_work(struct delayed_work *dwork) set_work_cpu_and_clear_pending(&dwork->work, work_cpu(&dwork->work)); local_irq_restore(flags); - return true; + return ret; } EXPORT_SYMBOL(cancel_delayed_work); |