2 files changed, 9 insertions, 7 deletions

diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index eb3af41a3c1c..4a67320fb4bc 100644
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -1038,6 +1038,10 @@ zfcp_adapter_enqueue(struct ccw_device *ccw_device)
         spin_lock_init(&adapter->san_dbf_lock);
         spin_lock_init(&adapter->scsi_dbf_lock);
 
+        retval = zfcp_adapter_debug_register(adapter);
+        if (retval)
+                goto debug_register_failed;
+
         /* initialize error recovery stuff */
 
         rwlock_init(&adapter->erp_lock);
@@ -1084,6 +1088,8 @@ zfcp_adapter_enqueue(struct ccw_device *ccw_device)
  generic_services_failed:
         zfcp_sysfs_adapter_remove_files(&adapter->ccw_device->dev);
  sysfs_failed:
+        zfcp_adapter_debug_unregister(adapter);
+ debug_register_failed:
         dev_set_drvdata(&ccw_device->dev, NULL);
         zfcp_reqlist_free(adapter);
  failed_low_mem_buffers:
@@ -1129,6 +1135,8 @@ zfcp_adapter_dequeue(struct zfcp_adapter *adapter)
                 goto out;
         }
 
+        zfcp_adapter_debug_unregister(adapter);
+
         /* remove specified adapter data structure from list */
         write_lock_irq(&zfcp_data.config_lock);
         list_del(&adapter->list);
diff --git a/drivers/s390/scsi/zfcp_ccw.c b/drivers/s390/scsi/zfcp_ccw.c
index 1c8f71a59855..2773724c5c77 100644
--- a/drivers/s390/scsi/zfcp_ccw.c
+++ b/drivers/s390/scsi/zfcp_ccw.c
@@ -150,15 +150,12 @@ zfcp_ccw_set_online(struct ccw_device *ccw_device)
         down(&zfcp_data.config_sema);
         adapter = dev_get_drvdata(&ccw_device->dev);
 
-        retval = zfcp_adapter_debug_register(adapter);
-        if (retval)
-                goto out;
         retval = zfcp_erp_thread_setup(adapter);
         if (retval) {
                 ZFCP_LOG_INFO("error: start of error recovery thread for "
                               "adapter %s failed\n",
                               zfcp_get_busid_by_adapter(adapter));
-                goto out_erp_thread;
+                goto out;
         }
 
         retval = zfcp_adapter_scsi_register(adapter);
@@ -177,8 +174,6 @@ zfcp_ccw_set_online(struct ccw_device *ccw_device)
 
  out_scsi_register:
         zfcp_erp_thread_kill(adapter);
- out_erp_thread:
-        zfcp_adapter_debug_unregister(adapter);
  out:
         up(&zfcp_data.config_sema);
         return retval;
@@ -201,7 +196,6 @@ zfcp_ccw_set_offline(struct ccw_device *ccw_device)
         zfcp_erp_adapter_shutdown(adapter, 0);
         zfcp_erp_wait(adapter);
         zfcp_erp_thread_kill(adapter);
-        zfcp_adapter_debug_unregister(adapter);
         up(&zfcp_data.config_sema);
         return 0;
 }