From c4a45ef53ea6096948956090ced649881e5805dc Mon Sep 17 00:00:00 2001 From: Krzysztof Helt Date: Wed, 23 Jul 2008 21:30:57 -0700 Subject: [PATCH] --- yaml --- r: 105504 b: refs/heads/master c: 3876ae8beb2c7c19e21279b9603b1244fcd744dd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/tridentfb.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a8ed2dfa8011..7f9b3ca2a2ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6bdf1035602abf0564d24a7447eea1c149c4bcb1 +refs/heads/master: 3876ae8beb2c7c19e21279b9603b1244fcd744dd diff --git a/trunk/drivers/video/tridentfb.c b/trunk/drivers/video/tridentfb.c index 8ee4261abf3b..e79788a778fe 100644 --- a/trunk/drivers/video/tridentfb.c +++ b/trunk/drivers/video/tridentfb.c @@ -1287,6 +1287,7 @@ static int __devinit trident_pci_probe(struct pci_dev *dev, if (!request_mem_region(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len, "tridentfb")) { debug("request_region failed!\n"); + framebuffer_release(info); return -1; } @@ -1299,8 +1300,6 @@ static int __devinit trident_pci_probe(struct pci_dev *dev, goto out_unmap1; } - enable_mmio(); - /* setup framebuffer memory */ tridentfb_fix.smem_start = pci_resource_start(dev, 0); tridentfb_fix.smem_len = get_memsize(default_par); @@ -1312,6 +1311,8 @@ static int __devinit trident_pci_probe(struct pci_dev *dev, goto out_unmap1; } + enable_mmio(); + info->screen_base = ioremap_nocache(tridentfb_fix.smem_start, tridentfb_fix.smem_len);