From ef330ef680ecfdc9e1d0826fbbcb30667cb9fb49 Mon Sep 17 00:00:00 2001 From: Brian King Date: Thu, 29 Mar 2007 12:43:01 -0500 Subject: [PATCH] --- yaml --- r: 53684 b: refs/heads/master c: cc9bd5d4256ecc1b6e0448febb4be29db1a91256 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/ipr.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d530c02a29a4..e1261a8eab55 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 185eb31cc242f415800a1a06dca522d27c269279 +refs/heads/master: cc9bd5d4256ecc1b6e0448febb4be29db1a91256 diff --git a/trunk/drivers/scsi/ipr.c b/trunk/drivers/scsi/ipr.c index 4fd6a3d81ffc..5b6ffe18bc7d 100644 --- a/trunk/drivers/scsi/ipr.c +++ b/trunk/drivers/scsi/ipr.c @@ -4473,6 +4473,9 @@ static void ipr_dump_ioasa(struct ipr_ioa_cfg *ioa_cfg, if (ioasa->ilid != 0) return; + if (!ipr_is_gscsi(res)) + return; + if (ipr_error_table[error_index].log_ioasa == 0) return; } @@ -4632,11 +4635,11 @@ static void ipr_erp_start(struct ipr_ioa_cfg *ioa_cfg, return; } - if (ipr_is_gscsi(res)) - ipr_dump_ioasa(ioa_cfg, ipr_cmd, res); - else + if (!ipr_is_gscsi(res)) ipr_gen_sense(ipr_cmd); + ipr_dump_ioasa(ioa_cfg, ipr_cmd, res); + switch (ioasc & IPR_IOASC_IOASC_MASK) { case IPR_IOASC_ABORTED_CMD_TERM_BY_HOST: if (ipr_is_naca_model(res))