diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-23 14:58:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-23 14:58:14 -0800 |
| commit | 5d219c6b9fa28b990b22e8e3b08a1a1f34400b4f (patch) | |
| tree | eec044bab1209e0307a340a0257be62e62fb2d96 | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | sparc64: Fix MSIQ HV call ordering in pci_sun4v_msiq_build_irq(). (diff) | |
| download | linux-dev-5d219c6b9fa28b990b22e8e3b08a1a1f34400b4f.tar.xz linux-dev-5d219c6b9fa28b990b22e8e3b08a1a1f34400b4f.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc64: Fix MSIQ HV call ordering in pci_sun4v_msiq_build_irq().
| -rw-r--r-- | arch/sparc/kernel/pci_sun4v.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/pci_sun4v.c b/arch/sparc/kernel/pci_sun4v.c index b272cda35a01..af5755d20fbe 100644 --- a/arch/sparc/kernel/pci_sun4v.c +++ b/arch/sparc/kernel/pci_sun4v.c @@ -849,10 +849,10 @@ static int pci_sun4v_msiq_build_irq(struct pci_pbm_info *pbm, if (!irq) return -ENOMEM; - if (pci_sun4v_msiq_setstate(pbm->devhandle, msiqid, HV_MSIQSTATE_IDLE)) - return -EINVAL; if (pci_sun4v_msiq_setvalid(pbm->devhandle, msiqid, HV_MSIQ_VALID)) return -EINVAL; + if (pci_sun4v_msiq_setstate(pbm->devhandle, msiqid, HV_MSIQSTATE_IDLE)) + return -EINVAL; return irq; } |