From: Jon Smirl <jonsmirl@gmail.com>
Date: Fri, 29 Jul 2005 19:16:17 +0000 (-0700)
Subject: [PATCH] PCI: Adjust PCI rom code to handle more broken ROMs
X-Git-Tag: v2.6.13-rc5~86
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=761a3ac08c63718dacde12aaf0ec6d6760e8c2b7;p=linux-2.6

[PATCH] PCI: Adjust PCI rom code to handle more broken ROMs

There are ROMs reporting that their size exceeds their PCI ROM
resource window. This patch returns the minimum of the resource window
size or the size in the ROM.  An example of this breakage is the XGI
Volari Z7.

Signed-off-by: Jon Smirl <jonsmirl@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c
index 838575e3fa..713c78f3a6 100644
--- a/drivers/pci/rom.c
+++ b/drivers/pci/rom.c
@@ -125,7 +125,9 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size)
 		image += readw(pds + 16) * 512;
 	} while (!last_image);
 
-	*size = image - rom;
+	/* never return a size larger than the PCI resource window */
+	/* there are known ROMs that get the size wrong */
+	*size = min((size_t)(image - rom), *size);
 
 	return rom;
 }