diff options
Diffstat (limited to 'drivers/video/sa1100fb.c')
-rw-r--r-- | drivers/video/sa1100fb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c index cd10b18150b8..5d2a4a4b731c 100644 --- a/drivers/video/sa1100fb.c +++ b/drivers/video/sa1100fb.c | |||
@@ -1200,9 +1200,9 @@ static void set_ctrlr_state(struct sa1100fb_info *fbi, u_int state) | |||
1200 | * Our LCD controller task (which is called when we blank or unblank) | 1200 | * Our LCD controller task (which is called when we blank or unblank) |
1201 | * via keventd. | 1201 | * via keventd. |
1202 | */ | 1202 | */ |
1203 | static void sa1100fb_task(void *dummy) | 1203 | static void sa1100fb_task(struct work_struct *w) |
1204 | { | 1204 | { |
1205 | struct sa1100fb_info *fbi = dummy; | 1205 | struct sa1100fb_info *fbi = container_of(w, struct sa1100fb_info, task); |
1206 | u_int state = xchg(&fbi->task_state, -1); | 1206 | u_int state = xchg(&fbi->task_state, -1); |
1207 | 1207 | ||
1208 | set_ctrlr_state(fbi, state); | 1208 | set_ctrlr_state(fbi, state); |
@@ -1444,7 +1444,7 @@ static struct sa1100fb_info * __init sa1100fb_init_fbinfo(struct device *dev) | |||
1444 | fbi->max_bpp / 8; | 1444 | fbi->max_bpp / 8; |
1445 | 1445 | ||
1446 | init_waitqueue_head(&fbi->ctrlr_wait); | 1446 | init_waitqueue_head(&fbi->ctrlr_wait); |
1447 | INIT_WORK(&fbi->task, sa1100fb_task, fbi); | 1447 | INIT_WORK(&fbi->task, sa1100fb_task); |
1448 | init_MUTEX(&fbi->ctrlr_sem); | 1448 | init_MUTEX(&fbi->ctrlr_sem); |
1449 | 1449 | ||
1450 | return fbi; | 1450 | return fbi; |