From 7a5b7a28beca3e02e552b5a35ab87a9ed676bd7b Mon Sep 17 00:00:00 2001 From: Amol Lad Date: Fri, 8 Dec 2006 02:40:12 -0800 Subject: [PATCH] --- yaml --- r: 43786 b: refs/heads/master c: 8d4c767ef56473b68a601274612d604c8c334dc9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/ffb.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c744fb5a26bd..c3e31bf640a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b3349fa448ce41eda5ae0e6d4dc52837d14ad11 +refs/heads/master: 8d4c767ef56473b68a601274612d604c8c334dc9 diff --git a/trunk/drivers/video/ffb.c b/trunk/drivers/video/ffb.c index 2a0e8210d398..949141bd44d4 100644 --- a/trunk/drivers/video/ffb.c +++ b/trunk/drivers/video/ffb.c @@ -968,6 +968,8 @@ static int ffb_init_one(struct of_device *op) if (fb_alloc_cmap(&all->info.cmap, 256, 0)) { printk(KERN_ERR "ffb: Could not allocate color map.\n"); + of_iounmap(all->par.fbc, sizeof(struct ffb_fbc)); + of_iounmap(all->par.dac, sizeof(struct ffb_dac)); kfree(all); return -ENOMEM; } @@ -978,6 +980,8 @@ static int ffb_init_one(struct of_device *op) if (err < 0) { printk(KERN_ERR "ffb: Could not register framebuffer.\n"); fb_dealloc_cmap(&all->info.cmap); + of_iounmap(all->par.fbc, sizeof(struct ffb_fbc)); + of_iounmap(all->par.dac, sizeof(struct ffb_dac)); kfree(all); return err; }