PCI: check pci_vpd_pci22_wait() return
authorGreg Thelen <gthelen@google.com>
Sun, 17 Apr 2011 15:22:21 +0000 (08:22 -0700)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Tue, 10 May 2011 22:43:35 +0000 (15:43 -0700)
pci_vpd_pci22_write() calls pci_vpd_pci22_wait() after writing
PCI_VPD_DATA and PCI_VPD_ADDR to wait for the VPD operation to complete.
The result pci_vpd_pci22_wait() was not checked for error.

This change checks for error.

Signed-off-by: Greg Thelen <gthelen@google.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
drivers/pci/access.c

index 531bc697d800910087d8ff2f125a00c03dd4abc9..0c1f20f570a4e25c392cc24b69fdcb70bca3a3f1 100644 (file)
@@ -324,6 +324,8 @@ static ssize_t pci_vpd_pci22_write(struct pci_dev *dev, loff_t pos, size_t count
                vpd->busy = true;
                vpd->flag = 0;
                ret = pci_vpd_pci22_wait(dev);
+               if (ret < 0)
+                       break;
 
                pos += sizeof(u32);
        }