From 94902c2ebf52d50844365325981cdc2d2f5c28dc Mon Sep 17 00:00:00 2001 From: Chad Dupuis Date: Tue, 15 May 2012 14:34:11 -0400 Subject: [PATCH] --- yaml --- r: 309629 b: refs/heads/master c: 008dda6650db2c8cd312d86ebe4a6c3a11daecd9 h: refs/heads/master i: 309627: c17c26bf4b1843a04bbab7b75e21d3a952950e1b v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla2xxx/qla_nx.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6b21b33ced1d..488be0a9f9c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24d9ee8549aa5d0234fd4d0f19fee03d1dc007e4 +refs/heads/master: 008dda6650db2c8cd312d86ebe4a6c3a11daecd9 diff --git a/trunk/drivers/scsi/qla2xxx/qla_nx.c b/trunk/drivers/scsi/qla2xxx/qla_nx.c index de722a933438..6f8850c38b3e 100644 --- a/trunk/drivers/scsi/qla2xxx/qla_nx.c +++ b/trunk/drivers/scsi/qla2xxx/qla_nx.c @@ -3352,13 +3352,11 @@ void qla82xx_watchdog(scsi_qla_host_t *vha) ql_log(ql_log_warn, vha, 0x6001, "Adapter reset needed.\n"); set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags); - qla2xxx_wake_dpc(vha); } else if (dev_state == QLA82XX_DEV_NEED_QUIESCENT && !test_bit(ISP_QUIESCE_NEEDED, &vha->dpc_flags)) { ql_log(ql_log_warn, vha, 0x6002, "Quiescent needed.\n"); set_bit(ISP_QUIESCE_NEEDED, &vha->dpc_flags); - qla2xxx_wake_dpc(vha); } else { if (qla82xx_check_fw_alive(vha)) { ql_dbg(ql_dbg_timer, vha, 0x6011, @@ -3398,7 +3396,6 @@ void qla82xx_watchdog(scsi_qla_host_t *vha) set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags); } - qla2xxx_wake_dpc(vha); ha->flags.isp82xx_fw_hung = 1; ql_log(ql_log_warn, vha, 0x6007, "Firmware hung.\n"); qla82xx_clear_pending_mbx(vha);