diff options
| author | Stefan Agner <stefan@agner.ch> | 2016-10-20 03:32:19 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-10-20 10:05:34 +0300 |
| commit | 41b9bb1b3be4cf6b9c28bbe1223744de48bf25c0 (patch) | |
| tree | 47ff0a54a7b186c73327810075cef17ac16c7492 /drivers/gpu/drm/drm_fb_cma_helper.c | |
| parent | e3f56b2953ec8160629295bc2be0c8d3b8f4d1d3 (diff) | |
| download | linux-41b9bb1b3be4cf6b9c28bbe1223744de48bf25c0.tar.xz | |
drm/fb_cma_helper: do not free fbdev if there is none
If fbdev emulation is not in use (or not built-in), fb_helper.fbdev
is NULL. Don't call calling drm_fbdev_cma_defio_fini in this case.
Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20161020003221.2941-2-stefan@agner.ch
Diffstat (limited to 'drivers/gpu/drm/drm_fb_cma_helper.c')
| -rw-r--r-- | drivers/gpu/drm/drm_fb_cma_helper.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_cma_helper.c index fac4f06f8485..4c6664407bfb 100644 --- a/drivers/gpu/drm/drm_fb_cma_helper.c +++ b/drivers/gpu/drm/drm_fb_cma_helper.c @@ -560,7 +560,8 @@ EXPORT_SYMBOL_GPL(drm_fbdev_cma_init); void drm_fbdev_cma_fini(struct drm_fbdev_cma *fbdev_cma) { drm_fb_helper_unregister_fbi(&fbdev_cma->fb_helper); - drm_fbdev_cma_defio_fini(fbdev_cma->fb_helper.fbdev); + if (fbdev_cma->fb_helper.fbdev) + drm_fbdev_cma_defio_fini(fbdev_cma->fb_helper.fbdev); drm_fb_helper_release_fbi(&fbdev_cma->fb_helper); if (fbdev_cma->fb) { |