---

yaml --- r: 204307 b: refs/heads/master c: 5767620 h: refs/heads/master i: 204305: 25a5520 204303: 4b0e497 v: v3
git-mirror · Jul 28, 2010 · 665b81c · 665b81c
1 parent 7150e05
commit 665b81c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;