diff options
| author | Mark Brown <broonie@kernel.org> | 2014-12-08 11:55:53 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-12-08 11:55:53 +0000 |
| commit | 49c42b458929aa5df4f3df028f34f49ceb1388e8 (patch) | |
| tree | 29ec6f105a58d9ac38a81814d9a1df7e55ea2bd1 /arch/powerpc/platforms/pseries | |
| parent | 11fd101c2ff91afae2e1d79e33caa9f50430ab14 (diff) | |
| parent | 356a3e1fde11190febb8ace3cdab8694848ed220 (diff) | |
Merge tag 'v3.14.26' into linux-linaro-lsk-v3.14
This is the 3.14.26 stable release
Diffstat (limited to 'arch/powerpc/platforms/pseries')
| -rw-r--r-- | arch/powerpc/platforms/pseries/msi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/msi.c b/arch/powerpc/platforms/pseries/msi.c index 0c882e83c4ce..6849d85ea0d5 100644 --- a/arch/powerpc/platforms/pseries/msi.c +++ b/arch/powerpc/platforms/pseries/msi.c @@ -428,7 +428,7 @@ static int rtas_setup_msi_irqs(struct pci_dev *pdev, int nvec_in, int type) */ again: if (type == PCI_CAP_ID_MSI) { - if (pdn->force_32bit_msi) { + if (pdev->no_64bit_msi) { rc = rtas_change_msi(pdn, RTAS_CHANGE_32MSI_FN, nvec); if (rc < 0) { /* |