diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-08-29 05:14:30 -0400 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-08-29 05:14:30 -0400 |
| commit | d4a7dbfdf180a656de3eb9e64614e2b991ffaa53 (patch) | |
| tree | f7d0d548004751aea77f63e6fd695faf0785bde0 /drivers/video/fb_defio.c | |
| parent | b5480ed72e4f299c53d1857faaf4f492650ccc43 (diff) | |
| parent | fa514fbc57419505d0e9423dbb8742f2775f882e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x into fbdev-next
Conflicts:
drivers/video/atmel_lcdfb.c
Diffstat (limited to 'drivers/video/fb_defio.c')
| -rw-r--r-- | drivers/video/fb_defio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c index 32814e8800e0..c27e153d8882 100644 --- a/drivers/video/fb_defio.c +++ b/drivers/video/fb_defio.c | |||
| @@ -223,8 +223,7 @@ void fb_deferred_io_cleanup(struct fb_info *info) | |||
| 223 | int i; | 223 | int i; |
| 224 | 224 | ||
| 225 | BUG_ON(!fbdefio); | 225 | BUG_ON(!fbdefio); |
| 226 | cancel_delayed_work(&info->deferred_work); | 226 | cancel_delayed_work_sync(&info->deferred_work); |
| 227 | flush_scheduled_work(); | ||
| 228 | 227 | ||
| 229 | /* clear out the mapping that we setup */ | 228 | /* clear out the mapping that we setup */ |
| 230 | for (i = 0 ; i < info->fix.smem_len; i += PAGE_SIZE) { | 229 | for (i = 0 ; i < info->fix.smem_len; i += PAGE_SIZE) { |