Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bdbc7dc authored by Scott Thompson's avatar Scott Thompson Committed by Dave Airlie
Browse files

agp: balance ioremap checks 



patchset against 2.6.23-rc3.
corrects missing ioremap return checks and balancing on iounmap calls, integrated changes per list
recommendations on the original set of patches..

Signed-off-by: Scott Thompson <postfail <at> hushmail.com>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 32ddef98

drivers/char/agp/amd-k7-agp.c

+2 −0
Original line number Diff line number Diff line
@@ -223,6 +223,8 @@ static int amd_irongate_configure(void) 
	pci_read_config_dword(agp_bridge->dev, AMD_MMBASE, &temp);

	temp = (temp & PCI_BASE_ADDRESS_MEM_MASK);

	amd_irongate_private.registers = (volatile u8 __iomem *) ioremap(temp, 4096);

	if (!amd_irongate_private.registers)

		return -ENOMEM;



	/* Write out the address of the gatt table */

	writel(agp_bridge->gatt_bus_addr, amd_irongate_private.registers+AMD_ATTBASE);

drivers/char/agp/ati-agp.c

+3 −0
Original line number Diff line number Diff line
@@ -213,6 +213,9 @@ static int ati_configure(void) 
	temp = (temp & 0xfffff000);

	ati_generic_private.registers = (volatile u8 __iomem *) ioremap(temp, 4096);



	if (!ati_generic_private.registers)

		return -ENOMEM;



	if (is_r200())

		pci_write_config_dword(agp_bridge->dev, ATI_RS100_IG_AGPMODE, 0x20000);

	else

drivers/char/agp/hp-agp.c

+1 −0
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ hp_zx1_lba_init (u64 hpa) 
	if (cap != PCI_CAP_ID_AGP) {

		printk(KERN_ERR PFX "Invalid capability ID 0x%02x at 0x%x\n",

		       cap, hp->lba_cap_offset);

		iounmap(hp->lba_regs);

		return -ENODEV;

	}

drivers/char/agp/i460-agp.c

+4 −0
Original line number Diff line number Diff line
@@ -249,6 +249,10 @@ static int i460_create_gatt_table (struct agp_bridge_data *bridge) 
	num_entries = A_SIZE_8(temp)->num_entries;



	i460.gatt = ioremap(INTEL_I460_ATTBASE, PAGE_SIZE << page_order);

	if (!i460.gatt) {

		printk(KERN_ERR PFX "ioremap failed\n");

		return -ENOMEM;

	}



	/* These are no good, the should be removed from the agp_bridge strucure... */

	agp_bridge->gatt_table_real = NULL;

drivers/char/agp/intel-agp.c

+9 −5
Original line number Diff line number Diff line
@@ -930,8 +930,10 @@ static int intel_i915_create_gatt_table(struct agp_bridge_data *bridge) 
	temp &= 0xfff80000;



	intel_private.registers = ioremap(temp,128 * 4096);

	if (!intel_private.registers)

	if (!intel_private.registers) {

		iounmap(intel_private.gtt);

		return -ENOMEM;

	}



	temp = readl(intel_private.registers+I810_PGETBL_CTL) & 0xfffff000;

	global_cache_flush();	/* FIXME: ? */
@@ -990,8 +992,10 @@ static int intel_i965_create_gatt_table(struct agp_bridge_data *bridge) 




       intel_private.registers = ioremap(temp,128 * 4096);

       if (!intel_private.registers)

       if (!intel_private.registers) {

		iounmap(intel_private.gtt);

		return -ENOMEM;

	}



       temp = readl(intel_private.registers+I810_PGETBL_CTL) & 0xfffff000;

       global_cache_flush();   /* FIXME: ? */