---

yaml --- r: 204312 b: refs/heads/master c: f7bd7c3 h: refs/heads/master v: v3
git-mirror · Jul 28, 2010 · fecbc4e · fecbc4e
1 parent 4a8f03c
commit fecbc4e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c785d944e6fa7eef390c799b93e43243505780c
+refs/heads/master: f7bd7c3627a3cf06bf1c6da55339469ec1853a48
diff --git a/trunk/drivers/s390/scsi/zfcp_erp.c b/trunk/drivers/s390/scsi/zfcp_erp.c
@@ -897,8 +897,7 @@ static int zfcp_erp_port_strategy_open_common(struct zfcp_erp_action *act)
 		}
 		if (port->d_id && !(p_status & ZFCP_STATUS_COMMON_NOESC)) {
 			port->d_id = 0;
-			_zfcp_erp_port_reopen(port, 0, "erpsoc1", NULL);
-			return ZFCP_ERP_EXIT;
+			return ZFCP_ERP_FAILED;
 		}
 		/* fall through otherwise */
 	}