From ca21198291bcfcd714224de2747b64e8bb0f5421 Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Sun, 4 Feb 2007 17:37:42 -0500 Subject: [PATCH] --- yaml --- r: 48647 b: refs/heads/master c: e4ac5e4f55f55b16e084a46b1b8e233f490ba701 h: refs/heads/master i: 48645: d1775d1dd974a63f2918227bf3c910c11562bd42 48643: 1b56171d62751777dab33c2c7a993c08c6420c2e 48639: 547d7c10ed76aa79b0601c1876dda5838337680e v: v3 --- [refs] | 2 +- trunk/drivers/char/agp/intel-agp.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 21e01ee312ae..c8368b797da0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a030ce4477baa06dd9c037ccd3c8d171aac9ed44 +refs/heads/master: e4ac5e4f55f55b16e084a46b1b8e233f490ba701 diff --git a/trunk/drivers/char/agp/intel-agp.c b/trunk/drivers/char/agp/intel-agp.c index 4e455f03b4f0..49cf7e2df47a 100644 --- a/trunk/drivers/char/agp/intel-agp.c +++ b/trunk/drivers/char/agp/intel-agp.c @@ -124,13 +124,15 @@ static int intel_i810_configure(void) current_size = A_SIZE_FIX(agp_bridge->current_size); - pci_read_config_dword(intel_i810_private.i810_dev, I810_MMADDR, &temp); - temp &= 0xfff80000; - - intel_i810_private.registers = ioremap(temp, 128 * 4096); if (!intel_i810_private.registers) { - printk(KERN_ERR PFX "Unable to remap memory.\n"); - return -ENOMEM; + pci_read_config_dword(intel_i810_private.i810_dev, I810_MMADDR, &temp); + temp &= 0xfff80000; + + intel_i810_private.registers = ioremap(temp, 128 * 4096); + if (!intel_i810_private.registers) { + printk(KERN_ERR PFX "Unable to remap memory.\n"); + return -ENOMEM; + } } if ((readl(intel_i810_private.registers+I810_DRAM_CTL)