diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-06-24 12:18:41 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-06-24 12:18:41 +0800 |
| commit | bbe8f0ee88a1eb4bb1e72e593b008faf387f30ac (patch) | |
| tree | 83368f0950f7396944642057dd521044b696b7f5 /drivers/gpu/drm/bochs/bochs_fbdev.c | |
| parent | 1beb6ea36b283c1dc34812c6ef9bf56a1e494f8c (diff) | |
| parent | d420f00c7bfb405884dd71fb7f87974f0d1be455 (diff) | |
Merge tag 'v3.18.36' into linux-linaro-lsk-v3.18lsk-v3.18-16.06
This is the 3.18.36 stable release
Diffstat (limited to 'drivers/gpu/drm/bochs/bochs_fbdev.c')
| -rw-r--r-- | drivers/gpu/drm/bochs/bochs_fbdev.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/gpu/drm/bochs/bochs_fbdev.c b/drivers/gpu/drm/bochs/bochs_fbdev.c index fe95d31cd110..9cdab0f2575c 100644 --- a/drivers/gpu/drm/bochs/bochs_fbdev.c +++ b/drivers/gpu/drm/bochs/bochs_fbdev.c @@ -197,12 +197,22 @@ int bochs_fbdev_init(struct bochs_device *bochs) if (ret) return ret; - drm_fb_helper_single_add_all_connectors(&bochs->fb.helper); + ret = drm_fb_helper_single_add_all_connectors(&bochs->fb.helper); + if (ret) + goto fini; + drm_helper_disable_unused_functions(bochs->dev); - drm_fb_helper_initial_config(&bochs->fb.helper, 32); + + ret = drm_fb_helper_initial_config(&bochs->fb.helper, 32); + if (ret) + goto fini; bochs->fb.initialized = true; return 0; + +fini: + drm_fb_helper_fini(&bochs->fb.helper); + return ret; } void bochs_fbdev_fini(struct bochs_device *bochs) |