From dd2ab76b7fb1f655b86539ef318d74bb86854bbd Mon Sep 17 00:00:00 2001 From: Shyam Iyer Date: Thu, 14 Jul 2011 15:00:32 +0000 Subject: [PATCH] --- yaml --- r: 256323 b: refs/heads/master c: 8279171a5fe95902be12f4018907f246d51616d4 h: refs/heads/master i: 256321: 09ab05db10c7701eabd223a92298c8c1a0e8bf1f 256319: b293e312dee01d6bc4c16ee331fb3d77399a83d3 v: v3 --- [refs] | 2 +- trunk/drivers/net/bna/bnad.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bf0a7fbb7752..e534d4c2c513 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ecae42d37045ec71831d0e0e493e00b0e0732edd +refs/heads/master: 8279171a5fe95902be12f4018907f246d51616d4 diff --git a/trunk/drivers/net/bna/bnad.c b/trunk/drivers/net/bna/bnad.c index 795b93b73b12..fa997bfc2e53 100644 --- a/trunk/drivers/net/bna/bnad.c +++ b/trunk/drivers/net/bna/bnad.c @@ -1109,7 +1109,7 @@ bnad_mbox_irq_alloc(struct bnad *bnad, struct bna_intr_info *intr_info) { int err = 0; - unsigned long irq_flags = 0, flags; + unsigned long irq_flags, flags; u32 irq; irq_handler_t irq_handler; @@ -1123,6 +1123,7 @@ bnad_mbox_irq_alloc(struct bnad *bnad, if (bnad->cfg_flags & BNAD_CF_MSIX) { irq_handler = (irq_handler_t)bnad_msix_mbox_handler; irq = bnad->msix_table[bnad->msix_num - 1].vector; + irq_flags = 0; intr_info->intr_type = BNA_INTR_T_MSIX; intr_info->idl[0].vector = bnad->msix_num - 1; } else { @@ -1133,7 +1134,6 @@ bnad_mbox_irq_alloc(struct bnad *bnad, /* intr_info->idl.vector = 0 ? */ } spin_unlock_irqrestore(&bnad->bna_lock, flags); - flags = irq_flags; sprintf(bnad->mbox_irq_name, "%s", BNAD_NAME); /* @@ -1144,7 +1144,7 @@ bnad_mbox_irq_alloc(struct bnad *bnad, BNAD_UPDATE_CTR(bnad, mbox_intr_disabled); - err = request_irq(irq, irq_handler, flags, + err = request_irq(irq, irq_handler, irq_flags, bnad->mbox_irq_name, bnad); if (err) {