diff options
| author | Greg Thelen <gthelen@google.com> | 2011-04-17 17:22:21 +0200 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2011-05-11 00:43:35 +0200 |
| commit | d97ecd819137118b4686a753415f93215a6edacf (patch) | |
| tree | 68148c65b62796b9d99b1b48ddcd64c4aec6b19c /drivers/pci | |
| parent | PCI: Use ICH6_GPIO_EN in ich6_lpc_acpi_gpio (diff) | |
| download | linux-d97ecd819137118b4686a753415f93215a6edacf.tar.xz linux-d97ecd819137118b4686a753415f93215a6edacf.zip | |
PCI: check pci_vpd_pci22_wait() return
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>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/access.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/access.c b/drivers/pci/access.c index 531bc697d800..0c1f20f570a4 100644 --- a/drivers/pci/access.c +++ b/drivers/pci/access.c @@ -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); } |