2011-04-17 15:22:40

by Greg Thelen

Subject: [PATCH] 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 <[email protected]>
---
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 502610b..fdaa42a 100644
--- a/drivers/pci/access.c
+++ b/drivers/pci/access.c
@@ -334,6 +334,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);
}
--
1.7.3.1

2011-04-20 15:14:09

by Jesse Barnes

Subject: Re: [PATCH] PCI: check pci_vpd_pci22_wait() return

On Sun, 17 Apr 2011 08:22:21 -0700
Greg Thelen <[email protected]> wrote:

> 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.

Applied the two return value fixes to linux-next, thanks.

--
Jesse Barnes, Intel Open Source Technology Center