summaryrefslogtreecommitdiffstats
path: root/drivers/video/vesafb.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2011-07-07 13:39:38 -0700
committerKeith Packard <keithp@keithp.com>2011-07-07 13:39:38 -0700
commitbc67f799e7667fb3c00286f2415c3cc44a253aec (patch)
tree271ae5f17012caafe3d3ac3daf0776808b71cf48 /drivers/video/vesafb.c
parent89c6143263ef8e14e42e17324a234418d8030b10 (diff)
parentc7ad381078ee1b5ce2ab5274bd5f12fee6e1e59a (diff)
downloadblackbird-op-linux-bc67f799e7667fb3c00286f2415c3cc44a253aec.tar.gz
blackbird-op-linux-bc67f799e7667fb3c00286f2415c3cc44a253aec.zip
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'drivers/video/vesafb.c')
-rw-r--r--drivers/video/vesafb.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index a99bbe86db13..501b3406c6d5 100644
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -175,6 +175,7 @@ static int vesafb_setcolreg(unsigned regno, unsigned red, unsigned green,
static void vesafb_destroy(struct fb_info *info)
{
+ fb_dealloc_cmap(&info->cmap);
if (info->screen_base)
iounmap(info->screen_base);
release_mem_region(info->apertures->ranges[0].base, info->apertures->ranges[0].size);
OpenPOWER on IntegriCloud