diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2014-11-19 12:06:30 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2014-11-19 12:06:30 -0500 |
| commit | 56429e9b3be567a173bd05f5594faf8522c34d3a (patch) | |
| tree | d218d430ed992cdfa42da084bf36e5aa3c2ecb26 /arch/mips/pci/msi-xlp.c | |
| parent | 5b095e99928cc13332d364f7cca7a9ca684369b4 (diff) | |
| parent | 093a1468b6edb0e568be7311b8d2228d205702db (diff) | |
merge nfs bugfixes into nfsd for-3.19 branch
In addition to nfsd bugfixes, there are some fixes in -rc5 for client
bugs that can interfere with my testing.
Diffstat (limited to 'arch/mips/pci/msi-xlp.c')
| -rw-r--r-- | arch/mips/pci/msi-xlp.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/mips/pci/msi-xlp.c b/arch/mips/pci/msi-xlp.c index fa374fe3746b..f7ac3edda1b2 100644 --- a/arch/mips/pci/msi-xlp.c +++ b/arch/mips/pci/msi-xlp.c @@ -443,10 +443,8 @@ static int xlp_setup_msix(uint64_t lnkbase, int node, int link, msg.data = 0xc00 | msixvec; ret = irq_set_msi_desc(xirq, desc); - if (ret < 0) { - destroy_irq(xirq); + if (ret < 0) return ret; - } write_msi_msg(xirq, &msg); return 0; |