diff options
Diffstat (limited to 'drivers/video/ep93xx-fb.c')
-rw-r--r-- | drivers/video/ep93xx-fb.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/video/ep93xx-fb.c b/drivers/video/ep93xx-fb.c index 2e830ec52a5a..f8babbeee275 100644 --- a/drivers/video/ep93xx-fb.c +++ b/drivers/video/ep93xx-fb.c | |||
@@ -519,12 +519,15 @@ static int __devinit ep93xxfb_probe(struct platform_device *pdev) | |||
519 | goto failed; | 519 | goto failed; |
520 | } | 520 | } |
521 | 521 | ||
522 | res = request_mem_region(res->start, resource_size(res), pdev->name); | 522 | /* |
523 | if (!res) { | 523 | * FIXME - We don't do a request_mem_region here because we are |
524 | err = -EBUSY; | 524 | * sharing the register space with the backlight driver (see |
525 | goto failed; | 525 | * drivers/video/backlight/ep93xx_bl.c) and doing so will cause |
526 | } | 526 | * the second loaded driver to return -EBUSY. |
527 | 527 | * | |
528 | * NOTE: No locking is required; the backlight does not touch | ||
529 | * any of the framebuffer registers. | ||
530 | */ | ||
528 | fbi->res = res; | 531 | fbi->res = res; |
529 | fbi->mmio_base = ioremap(res->start, resource_size(res)); | 532 | fbi->mmio_base = ioremap(res->start, resource_size(res)); |
530 | if (!fbi->mmio_base) { | 533 | if (!fbi->mmio_base) { |
@@ -586,8 +589,6 @@ failed: | |||
586 | clk_put(fbi->clk); | 589 | clk_put(fbi->clk); |
587 | if (fbi->mmio_base) | 590 | if (fbi->mmio_base) |
588 | iounmap(fbi->mmio_base); | 591 | iounmap(fbi->mmio_base); |
589 | if (fbi->res) | ||
590 | release_mem_region(fbi->res->start, resource_size(fbi->res)); | ||
591 | ep93xxfb_dealloc_videomem(info); | 592 | ep93xxfb_dealloc_videomem(info); |
592 | if (&info->cmap) | 593 | if (&info->cmap) |
593 | fb_dealloc_cmap(&info->cmap); | 594 | fb_dealloc_cmap(&info->cmap); |
@@ -608,7 +609,6 @@ static int __devexit ep93xxfb_remove(struct platform_device *pdev) | |||
608 | clk_disable(fbi->clk); | 609 | clk_disable(fbi->clk); |
609 | clk_put(fbi->clk); | 610 | clk_put(fbi->clk); |
610 | iounmap(fbi->mmio_base); | 611 | iounmap(fbi->mmio_base); |
611 | release_mem_region(fbi->res->start, resource_size(fbi->res)); | ||
612 | ep93xxfb_dealloc_videomem(info); | 612 | ep93xxfb_dealloc_videomem(info); |
613 | fb_dealloc_cmap(&info->cmap); | 613 | fb_dealloc_cmap(&info->cmap); |
614 | 614 | ||