Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[linux-2.6] / drivers / video / fm2fb.c

diff --git a/drivers/video/fm2fb.c b/drivers/video/fm2fb.c
index a0763283d77651219cacab89273061004c2cd1fb..70ff55b1459675db71c6025e588129446434cbf4 100644 (file)
--- a/drivers/video/fm2fb.c
+++ b/drivers/video/fm2fb.c
@@ -172,7 +172,6 @@ static struct fb_ops fm2fb_ops = {
        .fb_fillrect    = cfb_fillrect,
        .fb_copyarea    = cfb_copyarea,
        .fb_imageblit   = cfb_imageblit,
-       .fb_cursor      = soft_cursor,
 };
 
     /*
@@ -284,6 +283,7 @@ static int __devinit fm2fb_probe(struct zorro_dev *z,
 
        if (register_framebuffer(info) < 0) {
                fb_dealloc_cmap(&info->cmap);
+               iounmap(info->screen_base);
                framebuffer_release(info);
                zorro_release_device(z);
                return -EINVAL;