Merge branch 'pci/trivial'

[platform/kernel/linux-rpi.git] / drivers / pci / iov.c

diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
index 8165f25..1e88fd4 100644 (file)
--- a/drivers/pci/iov.c
+++ b/drivers/pci/iov.c
@@ -253,8 +253,14 @@ static ssize_t sriov_numvfs_show(struct device *dev,
                                 char *buf)
 {
        struct pci_dev *pdev = to_pci_dev(dev);
+       u16 num_vfs;
+
+       /* Serialize vs sriov_numvfs_store() so readers see valid num_VFs */
+       device_lock(&pdev->dev);
+       num_vfs = pdev->sriov->num_VFs;
+       device_unlock(&pdev->dev);
 
-       return sprintf(buf, "%u\n", pdev->sriov->num_VFs);
+       return sprintf(buf, "%u\n", num_vfs);
 }
 
 /*