From 3996844df766626f132d720df061ed38b602af45 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Sat, 11 Jun 2005 09:45:30 +1000 Subject: [PATCH] --- yaml --- r: 1963 b: refs/heads/master c: 8d5f7b4353dae4c7ee342c61303372fd996ca161 h: refs/heads/master i: 1961: a7271e07ad97659e5cf7e4ef5dbb76105cf45f22 1959: f77b6f6ff59ea4e40ba1a74a52020fe0d9a81b32 v: v3 --- [refs] | 2 +- trunk/drivers/video/aty/radeon_base.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0ca0126e11ea..bdb7d00c3a72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3315ede1bdf7bc706b59870df41b9cdb6e3995a +refs/heads/master: 8d5f7b4353dae4c7ee342c61303372fd996ca161 diff --git a/trunk/drivers/video/aty/radeon_base.c b/trunk/drivers/video/aty/radeon_base.c index ee25b9e8db60..47a6b12bc968 100644 --- a/trunk/drivers/video/aty/radeon_base.c +++ b/trunk/drivers/video/aty/radeon_base.c @@ -2374,10 +2374,9 @@ static int radeonfb_pci_register (struct pci_dev *pdev, } while ( rinfo->fb_base == 0 && ((rinfo->mapped_vram /=2) >= MIN_MAPPED_VRAM) ); - if (rinfo->fb_base) - memset_io(rinfo->fb_base, 0, rinfo->mapped_vram); - else { - printk (KERN_ERR "radeonfb (%s): cannot map FB\n", pci_name(rinfo->pdev)); + if (rinfo->fb_base == NULL) { + printk (KERN_ERR "radeonfb (%s): cannot map FB\n", + pci_name(rinfo->pdev)); ret = -EIO; goto err_unmap_rom; }