Commit 81d0ce81 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] radeonfb.c 64-bit fixes

From: David Mosberger <davidm@napali.hpl.hp.com>

Don't truncate the ioremap return value to 32-bits.
parent d1d3c2f7
...@@ -2840,8 +2840,7 @@ static int radeonfb_pci_register (struct pci_dev *pdev, ...@@ -2840,8 +2840,7 @@ static int radeonfb_pci_register (struct pci_dev *pdev,
} }
/* map the regions */ /* map the regions */
rinfo->mmio_base = (u32) ioremap (rinfo->mmio_base_phys, rinfo->mmio_base = (unsigned long) ioremap (rinfo->mmio_base_phys, RADEON_REGSIZE);
RADEON_REGSIZE);
if (!rinfo->mmio_base) { if (!rinfo->mmio_base) {
printk ("radeonfb: cannot map MMIO\n"); printk ("radeonfb: cannot map MMIO\n");
release_mem_region (rinfo->mmio_base_phys, release_mem_region (rinfo->mmio_base_phys,
...@@ -2978,8 +2977,7 @@ static int radeonfb_pci_register (struct pci_dev *pdev, ...@@ -2978,8 +2977,7 @@ static int radeonfb_pci_register (struct pci_dev *pdev,
} }
} }
rinfo->fb_base = (u32) ioremap (rinfo->fb_base_phys, rinfo->fb_base = (unsigned long) ioremap (rinfo->fb_base_phys, rinfo->video_ram);
rinfo->video_ram);
if (!rinfo->fb_base) { if (!rinfo->fb_base) {
printk ("radeonfb: cannot map FB\n"); printk ("radeonfb: cannot map FB\n");
iounmap ((void*)rinfo->mmio_base); iounmap ((void*)rinfo->mmio_base);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment