diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-20 03:35:12 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-20 03:35:12 +0100 |
| commit | fa2c8f401797eee814b7b9fa0b23fa6c4c3f5533 (patch) | |
| tree | 826fb23071b866e112d6e9c510fe3ad4d668acdc /drivers/pci/iov.c | |
| parent | ASoC: Add __devinit annotation for pxa2xx_ac97_probe (diff) | |
| parent | Linux 3.3-rc4 (diff) | |
| download | linux-fa2c8f401797eee814b7b9fa0b23fa6c4c3f5533.tar.xz linux-fa2c8f401797eee814b7b9fa0b23fa6c4c3f5533.zip | |
Merge tag 'v3.3-rc4' into for-3.4 in order to resolve the conflict
resolved below within the FSI driver and allow the application of the
dmaeengine conversion that depends on this resolution.
Linux 3.3-rc4
Conflicts:
sound/soc/sh/fsi.c
Diffstat (limited to 'drivers/pci/iov.c')
| -rw-r--r-- | drivers/pci/iov.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index 0321fa3b4226..0dab5ecf61bb 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -347,8 +347,6 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn) return rc; } - pci_write_config_dword(dev, iov->pos + PCI_SRIOV_SYS_PGSIZE, iov->pgsz); - iov->ctrl |= PCI_SRIOV_CTRL_VFE | PCI_SRIOV_CTRL_MSE; pci_cfg_access_lock(dev); pci_write_config_word(dev, iov->pos + PCI_SRIOV_CTRL, iov->ctrl); @@ -466,6 +464,7 @@ found: return -EIO; pgsz &= ~(pgsz - 1); + pci_write_config_dword(dev, pos + PCI_SRIOV_SYS_PGSIZE, pgsz); nres = 0; for (i = 0; i < PCI_SRIOV_NUM_BARS; i++) { |