From d745052a7a16d37434ce37f8c6366efd61a36aa8 Mon Sep 17 00:00:00 2001 From: Grazvydas Ignotas Date: Fri, 9 Mar 2012 02:42:49 +0200 Subject: [PATCH] --- yaml --- r: 310297 b: refs/heads/master c: f3fb3bbc7f71d573be40213af4a90751a81b2379 h: refs/heads/master i: 310295: 4456bc3aa4f5e7be242a3064551c85f56734a2db v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/omapfb/omapfb-ioctl.c | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index c710644c70ad..402712870c49 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2c83af49ca83ebf521f9360baaca3718bb5d303e +refs/heads/master: f3fb3bbc7f71d573be40213af4a90751a81b2379 diff --git a/trunk/drivers/video/omap2/omapfb/omapfb-ioctl.c b/trunk/drivers/video/omap2/omapfb/omapfb-ioctl.c index 6a09ef87e14f..27a85813c600 100644 --- a/trunk/drivers/video/omap2/omapfb/omapfb-ioctl.c +++ b/trunk/drivers/video/omap2/omapfb/omapfb-ioctl.c @@ -225,6 +225,9 @@ static int omapfb_setup_mem(struct fb_info *fbi, struct omapfb_mem_info *mi) down_write_nested(&rg->lock, rg->id); atomic_inc(&rg->lock_count); + if (rg->size == size && rg->type == mi->type) + goto out; + if (atomic_read(&rg->map_count)) { r = -EBUSY; goto out; @@ -247,12 +250,10 @@ static int omapfb_setup_mem(struct fb_info *fbi, struct omapfb_mem_info *mi) } } - if (rg->size != size || rg->type != mi->type) { - r = omapfb_realloc_fbmem(fbi, size, mi->type); - if (r) { - dev_err(fbdev->dev, "realloc fbmem failed\n"); - goto out; - } + r = omapfb_realloc_fbmem(fbi, size, mi->type); + if (r) { + dev_err(fbdev->dev, "realloc fbmem failed\n"); + goto out; } out: