From 26a845b9a49f7e6cbc323f0498c2c85ca3a6f518 Mon Sep 17 00:00:00 2001 From: Saurav Kashyap Date: Wed, 21 Nov 2012 02:40:44 -0500 Subject: [PATCH] --- yaml --- r: 343760 b: refs/heads/master c: 68d91cbd5267e15a7c6da1415a1c65a9506aed96 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla2xxx/qla_dbg.c | 2 +- trunk/drivers/scsi/qla2xxx/qla_isr.c | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f87676fc22a8..2b97c5529bca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a63ad12e3efe81c5809a5e9418f19947de88da2 +refs/heads/master: 68d91cbd5267e15a7c6da1415a1c65a9506aed96 diff --git a/trunk/drivers/scsi/qla2xxx/qla_dbg.c b/trunk/drivers/scsi/qla2xxx/qla_dbg.c index 9b9c632b34fe..53f9e492f9dc 100644 --- a/trunk/drivers/scsi/qla2xxx/qla_dbg.c +++ b/trunk/drivers/scsi/qla2xxx/qla_dbg.c @@ -11,7 +11,7 @@ * ---------------------------------------------------------------------- * | Level | Last Value Used | Holes | * ---------------------------------------------------------------------- - * | Module Init and Probe | 0x0124 | 0x4b,0xba,0xfa | + * | Module Init and Probe | 0x0125 | 0x4b,0xba,0xfa | * | Mailbox commands | 0x114f | 0x111a-0x111b | * | | | 0x112c-0x112e | * | | | 0x113a | diff --git a/trunk/drivers/scsi/qla2xxx/qla_isr.c b/trunk/drivers/scsi/qla2xxx/qla_isr.c index 55ee3ba4dc2e..873c82014b16 100644 --- a/trunk/drivers/scsi/qla2xxx/qla_isr.c +++ b/trunk/drivers/scsi/qla2xxx/qla_isr.c @@ -2940,7 +2940,9 @@ qla2x00_request_irqs(struct qla_hw_data *ha, struct rsp_que *rsp) "Failed to reserve interrupt %d already in use.\n", ha->pdev->irq); goto fail; - } + } else if (!ha->flags.msi_enabled) + ql_dbg(ql_dbg_init, vha, 0x0125, + "INTa mode: Enabled.\n"); clear_risc_ints: