From 8f77faea8a566853af04e5aa8d073c8b6af8ab70 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Tue, 31 Jul 2012 15:54:18 +0200 Subject: [PATCH] --- yaml --- r: 333418 b: refs/heads/master c: d1bea50288c7a22e68c01bb11cdb2a8db7d2fa39 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/cobalt_lcdfb.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0f58936bb927..b9ba4d26aad5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be8678149701a42587741e2d391d8fa8830e9d3b +refs/heads/master: d1bea50288c7a22e68c01bb11cdb2a8db7d2fa39 diff --git a/trunk/drivers/video/cobalt_lcdfb.c b/trunk/drivers/video/cobalt_lcdfb.c index eae46f6457e2..01a4ee7cc6b1 100644 --- a/trunk/drivers/video/cobalt_lcdfb.c +++ b/trunk/drivers/video/cobalt_lcdfb.c @@ -348,7 +348,8 @@ static int __devinit cobalt_lcdfb_probe(struct platform_device *dev) } info->screen_size = resource_size(res); - info->screen_base = ioremap(res->start, info->screen_size); + info->screen_base = devm_ioremap(&dev->dev, res->start, + info->screen_size); info->fbops = &cobalt_lcd_fbops; info->fix = cobalt_lcdfb_fix; info->fix.smem_start = res->start; @@ -359,7 +360,6 @@ static int __devinit cobalt_lcdfb_probe(struct platform_device *dev) retval = register_framebuffer(info); if (retval < 0) { - iounmap(info->screen_base); framebuffer_release(info); return retval; } @@ -380,7 +380,6 @@ static int __devexit cobalt_lcdfb_remove(struct platform_device *dev) info = platform_get_drvdata(dev); if (info) { - iounmap(info->screen_base); unregister_framebuffer(info); framebuffer_release(info); }