Commit 3931445f authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

[PATCH] Fix 64bit bug in trident frame buffer driver

Fix another 64bit bug, this time in the trident frame buffer driver

When storing the ioremap_nocache() return in a integer the variable must be
long not int.
parent fe3f6208
......@@ -28,7 +28,7 @@
struct tridentfb_par {
int vclk; //in MHz
unsigned int io_virt; //iospace virtual memory address
unsigned long io_virt; //iospace virtual memory address
};
unsigned char eng_oper; //engine operation...
......@@ -1102,7 +1102,7 @@ static int __devinit trident_pci_probe(struct pci_dev * dev, const struct pci_de
return -1;
}
default_par.io_virt = (unsigned int)ioremap_nocache(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len);
default_par.io_virt = (unsigned long)ioremap_nocache(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len);
if (!default_par.io_virt) {
release_region(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len);
......
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