diff options
Diffstat (limited to 'drivers/net/bna/bnad.c')
-rw-r--r-- | drivers/net/bna/bnad.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/bna/bnad.c b/drivers/net/bna/bnad.c index 795b93b73b12..fa997bfc2e53 100644 --- a/drivers/net/bna/bnad.c +++ b/drivers/net/bna/bnad.c | |||
@@ -1109,7 +1109,7 @@ bnad_mbox_irq_alloc(struct bnad *bnad, | |||
1109 | struct bna_intr_info *intr_info) | 1109 | struct bna_intr_info *intr_info) |
1110 | { | 1110 | { |
1111 | int err = 0; | 1111 | int err = 0; |
1112 | unsigned long irq_flags = 0, flags; | 1112 | unsigned long irq_flags, flags; |
1113 | u32 irq; | 1113 | u32 irq; |
1114 | irq_handler_t irq_handler; | 1114 | irq_handler_t irq_handler; |
1115 | 1115 | ||
@@ -1123,6 +1123,7 @@ bnad_mbox_irq_alloc(struct bnad *bnad, | |||
1123 | if (bnad->cfg_flags & BNAD_CF_MSIX) { | 1123 | if (bnad->cfg_flags & BNAD_CF_MSIX) { |
1124 | irq_handler = (irq_handler_t)bnad_msix_mbox_handler; | 1124 | irq_handler = (irq_handler_t)bnad_msix_mbox_handler; |
1125 | irq = bnad->msix_table[bnad->msix_num - 1].vector; | 1125 | irq = bnad->msix_table[bnad->msix_num - 1].vector; |
1126 | irq_flags = 0; | ||
1126 | intr_info->intr_type = BNA_INTR_T_MSIX; | 1127 | intr_info->intr_type = BNA_INTR_T_MSIX; |
1127 | intr_info->idl[0].vector = bnad->msix_num - 1; | 1128 | intr_info->idl[0].vector = bnad->msix_num - 1; |
1128 | } else { | 1129 | } else { |
@@ -1133,7 +1134,6 @@ bnad_mbox_irq_alloc(struct bnad *bnad, | |||
1133 | /* intr_info->idl.vector = 0 ? */ | 1134 | /* intr_info->idl.vector = 0 ? */ |
1134 | } | 1135 | } |
1135 | spin_unlock_irqrestore(&bnad->bna_lock, flags); | 1136 | spin_unlock_irqrestore(&bnad->bna_lock, flags); |
1136 | flags = irq_flags; | ||
1137 | sprintf(bnad->mbox_irq_name, "%s", BNAD_NAME); | 1137 | sprintf(bnad->mbox_irq_name, "%s", BNAD_NAME); |
1138 | 1138 | ||
1139 | /* | 1139 | /* |
@@ -1144,7 +1144,7 @@ bnad_mbox_irq_alloc(struct bnad *bnad, | |||
1144 | 1144 | ||
1145 | BNAD_UPDATE_CTR(bnad, mbox_intr_disabled); | 1145 | BNAD_UPDATE_CTR(bnad, mbox_intr_disabled); |
1146 | 1146 | ||
1147 | err = request_irq(irq, irq_handler, flags, | 1147 | err = request_irq(irq, irq_handler, irq_flags, |
1148 | bnad->mbox_irq_name, bnad); | 1148 | bnad->mbox_irq_name, bnad); |
1149 | 1149 | ||
1150 | if (err) { | 1150 | if (err) { |