From 7db21096056083c471c84751286b4d85a9180f5b Mon Sep 17 00:00:00 2001 From: Swen Schillig Date: Wed, 17 Nov 2010 14:23:42 +0100 Subject: [PATCH] --- yaml --- r: 223169 b: refs/heads/master c: d3e1088d68735eb7da12f79a0c3c0d951cbc89f1 h: refs/heads/master i: 223167: d795b4e02d0eb7cff0c4b68f50370aae906b7a37 v: v3 --- [refs] | 2 +- trunk/drivers/s390/scsi/zfcp_erp.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3b05733e766e..ad486f308b5e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6fbf25e86beef1c6719e760a241a7aef9ad145e3 +refs/heads/master: d3e1088d68735eb7da12f79a0c3c0d951cbc89f1 diff --git a/trunk/drivers/s390/scsi/zfcp_erp.c b/trunk/drivers/s390/scsi/zfcp_erp.c index d37c7331f244..63422c13c7da 100644 --- a/trunk/drivers/s390/scsi/zfcp_erp.c +++ b/trunk/drivers/s390/scsi/zfcp_erp.c @@ -156,6 +156,8 @@ static int zfcp_erp_required_act(int want, struct zfcp_adapter *adapter, if (!(a_status & ZFCP_STATUS_COMMON_RUNNING) || a_status & ZFCP_STATUS_COMMON_ERP_FAILED) return 0; + if (p_status & ZFCP_STATUS_COMMON_NOESC) + return need; if (!(a_status & ZFCP_STATUS_COMMON_UNBLOCKED)) need = ZFCP_ERP_ACTION_REOPEN_ADAPTER; /* fall through */