From 604eaa0ab54faced5c9d201be74e4cd8dddd3bec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Pr=C3=A9mont?= Date: Wed, 30 Jun 2010 22:36:31 +0200 Subject: [PATCH] --- yaml --- r: 204371 b: refs/heads/master c: a7c9a0aa175aee8a66301264bff2a5ff014ca0e7 h: refs/heads/master i: 204369: 8f5808edbd07c014edf9b58e5343e092b19a739b 204367: f8e8f40449cdac08aee58e122435ad207b951a92 v: v3 --- [refs] | 2 +- trunk/drivers/hid/hid-picolcd.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c7cc2e1b3268..a460d723108c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6dc398acf944e768a62aa5eed925633e0a3dad0e +refs/heads/master: a7c9a0aa175aee8a66301264bff2a5ff014ca0e7 diff --git a/trunk/drivers/hid/hid-picolcd.c b/trunk/drivers/hid/hid-picolcd.c index 7aabf65c48ef..839a5ac0ad82 100644 --- a/trunk/drivers/hid/hid-picolcd.c +++ b/trunk/drivers/hid/hid-picolcd.c @@ -707,18 +707,19 @@ static int picolcd_init_framebuffer(struct picolcd_data *data) dev_err(dev, "failed to create sysfs attributes\n"); goto err_cleanup; } + fb_deferred_io_init(info); data->fb_info = info; error = register_framebuffer(info); if (error) { dev_err(dev, "failed to register framebuffer\n"); goto err_sysfs; } - fb_deferred_io_init(info); /* schedule first output of framebuffer */ schedule_delayed_work(&info->deferred_work, 0); return 0; err_sysfs: + fb_deferred_io_cleanup(info); device_remove_file(dev, &dev_attr_fb_update_rate); err_cleanup: data->fb_vbitmap = NULL; @@ -747,7 +748,6 @@ static void picolcd_exit_framebuffer(struct picolcd_data *data) data->fb_bpp = 0; data->fb_info = NULL; device_remove_file(&data->hdev->dev, &dev_attr_fb_update_rate); - fb_deferred_io_cleanup(info); unregister_framebuffer(info); vfree(fb_bitmap); kfree(fb_vbitmap);