diff --git a/[refs] b/[refs]
index 6be5d54b852d..e331c8446c17 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e96e2f148060330f6178b502574dcb81eb7318bf
+refs/heads/master: 761a3ac08c63718dacde12aaf0ec6d6760e8c2b7
diff --git a/trunk/drivers/pci/rom.c b/trunk/drivers/pci/rom.c
index 838575e3fac6..713c78f3a65d 100644
--- a/trunk/drivers/pci/rom.c
+++ b/trunk/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;
 }