X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fpci%2From.c;h=e31659ce91eb88b2695afdccc866fe1bb3b0ee50;hb=7efc268ac7e1f9d8bde269643450771cd1409852;hp=48ebdb237f3f73d1e37e6e2022940ea5262d459c;hpb=d8f46ff11081f03b09efe82245a3257bab6bf60e;p=pandora-kernel.git

diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c
index 48ebdb237f3f..e31659ce91eb 100644
--- a/drivers/pci/rom.c
+++ b/drivers/pci/rom.c
@@ -69,6 +69,7 @@ size_t pci_get_rom_size(struct pci_dev *pdev, void __iomem *rom, size_t size)
 {
 	void __iomem *image;
 	int last_image;
+	unsigned length;
 
 	image = rom;
 	do {
@@ -91,9 +92,9 @@ size_t pci_get_rom_size(struct pci_dev *pdev, void __iomem *rom, size_t size)
 		if (readb(pds + 3) != 'R')
 			break;
 		last_image = readb(pds + 21) & 0x80;
-		/* this length is reliable */
-		image += readw(pds + 16) * 512;
-	} while (!last_image);
+		length = readw(pds + 16);
+		image += length * 512;
+	} while (length && !last_image);
 
 	/* never return a size larger than the PCI resource window */
 	/* there are known ROMs that get the size wrong */