mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 19:56:18 +00:00
fbcon: fix workqueue shutdown
Add a call to cancel_work_sync() in fbcon_exit() to cancel any pending work in the fbcon workqueue. The current implementation of fbcon_exit() sets the fbcon workqueue function info->queue.func to NULL, but does not assure that there is no work pending when it does so. On occasion, depending on system timing, there will still be pending work in the queue when fbcon_exit() is called. This results in a null pointer deference when run_workqueue() tries to call the queue's work function. Fixes errors on shutdown similar to these: Console: switching to colour dummy device 80x25 Unable to handle kernel paging request for data at address 0x00000000 Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> Cc: Krzysztof Helt <krzysztof.h1@poczta.fm> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
6841c8e263
commit
beaa4867ee
1 changed files with 6 additions and 0 deletions
|
@ -3531,12 +3531,18 @@ static void fbcon_exit(void)
|
|||
softback_buf = 0UL;
|
||||
|
||||
for (i = 0; i < FB_MAX; i++) {
|
||||
int pending;
|
||||
|
||||
mapped = 0;
|
||||
info = registered_fb[i];
|
||||
|
||||
if (info == NULL)
|
||||
continue;
|
||||
|
||||
pending = cancel_work_sync(&info->queue);
|
||||
DPRINTK("fbcon: %s pending work\n", (pending ? "canceled" :
|
||||
"no"));
|
||||
|
||||
for (j = first_fb_vc; j <= last_fb_vc; j++) {
|
||||
if (con2fb_map[j] == i)
|
||||
mapped = 1;
|
||||
|
|
Loading…
Reference in a new issue