1 files changed, 8 insertions, 12 deletions

diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c
index eb0ad530dc43..5a1a39df75a1 100644
--- a/drivers/pci/rom.c
+++ b/drivers/pci/rom.c
@@ -77,22 +77,18 @@ size_t pci_get_rom_size(struct pci_dev *pdev, void __iomem *rom, size_t size)
         do {
                 void __iomem *pds;
                 /* Standard PCI ROMs start out with these bytes 55 AA */
-                if (readb(image) != 0x55) {
-                        dev_err(&pdev->dev, "Invalid ROM contents\n");
+                if (readw(image) != 0xAA55) {
+                        dev_err(&pdev->dev, "Invalid PCI ROM header signature: expecting 0xaa55, got %#06x\n",
+                                readw(image));
                         break;
                 }
-                if (readb(image + 1) != 0xAA)
-                        break;
-                /* get the PCI data structure and check its signature */
+                /* get the PCI data structure and check its "PCIR" signature */
                 pds = image + readw(image + 24);
-                if (readb(pds) != 'P')
-                        break;
-                if (readb(pds + 1) != 'C')
-                        break;
-                if (readb(pds + 2) != 'I')
-                        break;
-                if (readb(pds + 3) != 'R')
+                if (readl(pds) != 0x52494350) {
+                        dev_err(&pdev->dev, "Invalid PCI ROM data signature: expecting 0x52494350, got %#010x\n",
+                                readl(pds));
                         break;
+                }
                 last_image = readb(pds + 21) & 0x80;
                 length = readw(pds + 16);
                 image += length * 512;