summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-23 14:58:14 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-23 14:58:14 -0800
commit5d219c6b9fa28b990b22e8e3b08a1a1f34400b4f (patch)
treeeec044bab1209e0307a340a0257be62e62fb2d96
parent155d4551bd0ab04367f4ca4e0a229774497da4d8 (diff)
parent7cc8583372a21d98a23b703ad96cab03180b5030 (diff)
downloadlinux-5d219c6b9fa28b990b22e8e3b08a1a1f34400b4f.tar.gz
linux-5d219c6b9fa28b990b22e8e3b08a1a1f34400b4f.tar.bz2
linux-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.c4
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;
}