diff options
| author | David S. Miller <davem@davemloft.net> | 2016-01-06 22:54:18 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-01-06 22:54:18 -0500 |
| commit | 9e0efaf6b41bf22c2eb81258fc2a6f1538a643e5 (patch) | |
| tree | e2daa5fb47f707f44b6b7e9da82a6d8017af3f8c /drivers/net/ethernet/qlogic/qlcnic | |
| parent | c7f5d105495a38ed09e70d825f75d9d7d5407264 (diff) | |
| parent | 51cb67c0b0fcb91581b15bd2e85f29af4d4b2df6 (diff) | |
| download | linux-stable-9e0efaf6b41bf22c2eb81258fc2a6f1538a643e5.tar.gz linux-stable-9e0efaf6b41bf22c2eb81258fc2a6f1538a643e5.tar.bz2 linux-stable-9e0efaf6b41bf22c2eb81258fc2a6f1538a643e5.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/qlogic/qlcnic')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c index a5f422f26cb4..daf05155b732 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c @@ -772,8 +772,10 @@ int qlcnic_82xx_config_intrpt(struct qlcnic_adapter *adapter, u8 op_type) int i, err = 0; for (i = 0; i < ahw->num_msix; i++) { - qlcnic_alloc_mbx_args(&cmd, adapter, - QLCNIC_CMD_MQ_TX_CONFIG_INTR); + err = qlcnic_alloc_mbx_args(&cmd, adapter, + QLCNIC_CMD_MQ_TX_CONFIG_INTR); + if (err) + return err; type = op_type ? QLCNIC_INTRPT_ADD : QLCNIC_INTRPT_DEL; val = type | (ahw->intr_tbl[i].type << 4); if (ahw->intr_tbl[i].type == QLCNIC_INTRPT_MSIX) |