[SCSI] zfcp: register with SCSI layer on ccw registration

Synchronize the registration and de-registration with the SCSI layer
at CCW registration, de-registration. Before we registered with the
SCSI layer on adapter activation. This way the reg and de-reg process
is in balance.

Signed-off-by: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

2 files changed, 2 insertions, 7 deletions

diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index e529b55b3ce9..f0f49feaa34f 100644
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -534,7 +534,8 @@ int zfcp_adapter_enqueue(struct ccw_device *ccw_device)
 
         zfcp_fc_nameserver_init(adapter);
 
-        return 0;
+        if (!zfcp_adapter_scsi_register(adapter))
+                return 0;
 
 sysfs_failed:
         zfcp_adapter_debug_unregister(adapter);
diff --git a/drivers/s390/scsi/zfcp_ccw.c b/drivers/s390/scsi/zfcp_ccw.c
index 728147131e1d..285881f07648 100644
--- a/drivers/s390/scsi/zfcp_ccw.c
+++ b/drivers/s390/scsi/zfcp_ccw.c
@@ -106,10 +106,6 @@ static int zfcp_ccw_set_online(struct ccw_device *ccw_device)
         if (retval)
                 goto out;
 
-        retval = zfcp_adapter_scsi_register(adapter);
-        if (retval)
-                goto out_scsi_register;
-
         /* initialize request counter */
         BUG_ON(!zfcp_reqlist_isempty(adapter));
         adapter->req_no = 0;
@@ -123,8 +119,6 @@ static int zfcp_ccw_set_online(struct ccw_device *ccw_device)
         flush_work(&adapter->scan_work);
         return 0;
 
- out_scsi_register:
-        zfcp_erp_thread_kill(adapter);
  out:
         up(&zfcp_data.config_sema);
         return retval;