From 665b81c6010e049bf0da5cebadf41bd65cb427f0 Mon Sep 17 00:00:00 2001
From: Christof Schmitt <christof.schmitt@de.ibm.com>
Date: Thu, 8 Jul 2010 09:53:05 +0200
Subject: [PATCH] --- yaml --- r: 204307 b: refs/heads/master c:
 5767620c383a226e39891e7e654a70ebb8e95e69 h: refs/heads/master i:   204305:
 25a55203b5a8e110683f5b2da214931a5930bcb9   204303:
 4b0e497b38dd0a2c5e93996a29fa5bf219885746 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/s390/scsi/zfcp_erp.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 911a55d52fc1..04cb0bb95267 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 478a8a0543021172220feeb0b39bb1b3e43c988f
+refs/heads/master: 5767620c383a226e39891e7e654a70ebb8e95e69
diff --git a/trunk/drivers/s390/scsi/zfcp_erp.c b/trunk/drivers/s390/scsi/zfcp_erp.c
index fd068bc1bd0a..c663eb2ecf32 100644
--- a/trunk/drivers/s390/scsi/zfcp_erp.c
+++ b/trunk/drivers/s390/scsi/zfcp_erp.c
@@ -1197,10 +1197,11 @@ static void zfcp_erp_action_cleanup(struct zfcp_erp_action *act, int result)
 		put_device(&unit->dev);
 		break;
 
-	case ZFCP_ERP_ACTION_REOPEN_PORT_FORCED:
 	case ZFCP_ERP_ACTION_REOPEN_PORT:
 		if (result == ZFCP_ERP_SUCCEEDED)
 			zfcp_scsi_schedule_rport_register(port);
+		/* fall through */
+	case ZFCP_ERP_ACTION_REOPEN_PORT_FORCED:
 		put_device(&port->dev);
 		break;