---

yaml --- r: 119003 b: refs/heads/master c: 77fd949 h: refs/heads/master i: 119001: 62f7a9d 118999: a5b8f16 v: v3
git-mirror · Nov 5, 2008 · 0b1a2cb · 0b1a2cb
1 parent c9f0382
commit 0b1a2cb
Show file tree

Hide file tree

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