From 0b1a2cb031acc76765257fb057fe34f2fa0d56a7 Mon Sep 17 00:00:00 2001
From: Christof Schmitt <christof.schmitt@de.ibm.com>
Date: Tue, 4 Nov 2008 16:35:10 +0100
Subject: [PATCH] --- yaml --- r: 119003 b: refs/heads/master c:
 77fd9494bce3188c20d82e45464ed9b1be83bf98 h: refs/heads/master i:   119001:
 62f7a9d2c0f9c04bc3892bebebddaac76efd67e1   118999:
 a5b8f1659fa7453e4853abdbfc4128010119cafd v: v3

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

diff --git a/[refs] b/[refs]
index 62011d9e5a4d..44bfcd233cd5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: adc90daffbb454eeae00df92855a88ba79b5b636
+refs/heads/master: 77fd9494bce3188c20d82e45464ed9b1be83bf98
diff --git a/trunk/drivers/s390/scsi/zfcp_ccw.c b/trunk/drivers/s390/scsi/zfcp_ccw.c
index b04038c74786..951a8d409d1d 100644
--- a/trunk/drivers/s390/scsi/zfcp_ccw.c
+++ b/trunk/drivers/s390/scsi/zfcp_ccw.c
@@ -116,7 +116,9 @@ static int zfcp_ccw_set_online(struct ccw_device *ccw_device)
 	zfcp_erp_adapter_reopen(adapter, ZFCP_STATUS_COMMON_ERP_FAILED, 85,
 				NULL);
 	zfcp_erp_wait(adapter);
-	goto out;
+	up(&zfcp_data.config_sema);
+	flush_work(&adapter->scan_work);
+	return 0;
 
  out_scsi_register:
 	zfcp_erp_thread_kill(adapter);