aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/scsi/zfcp_ccw.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/s390/scsi/zfcp_ccw.c')
-rw-r--r--drivers/s390/scsi/zfcp_ccw.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/s390/scsi/zfcp_ccw.c b/drivers/s390/scsi/zfcp_ccw.c
index c0d1c0eb3209..e01cbf152a81 100644
--- a/drivers/s390/scsi/zfcp_ccw.c
+++ b/drivers/s390/scsi/zfcp_ccw.c
@@ -148,15 +148,12 @@ zfcp_ccw_set_online(struct ccw_device *ccw_device)
148 down(&zfcp_data.config_sema); 148 down(&zfcp_data.config_sema);
149 adapter = dev_get_drvdata(&ccw_device->dev); 149 adapter = dev_get_drvdata(&ccw_device->dev);
150 150
151 retval = zfcp_adapter_debug_register(adapter);
152 if (retval)
153 goto out;
154 retval = zfcp_erp_thread_setup(adapter); 151 retval = zfcp_erp_thread_setup(adapter);
155 if (retval) { 152 if (retval) {
156 ZFCP_LOG_INFO("error: start of error recovery thread for " 153 ZFCP_LOG_INFO("error: start of error recovery thread for "
157 "adapter %s failed\n", 154 "adapter %s failed\n",
158 zfcp_get_busid_by_adapter(adapter)); 155 zfcp_get_busid_by_adapter(adapter));
159 goto out_erp_thread; 156 goto out;
160 } 157 }
161 158
162 retval = zfcp_adapter_scsi_register(adapter); 159 retval = zfcp_adapter_scsi_register(adapter);
@@ -175,8 +172,6 @@ zfcp_ccw_set_online(struct ccw_device *ccw_device)
175 172
176 out_scsi_register: 173 out_scsi_register:
177 zfcp_erp_thread_kill(adapter); 174 zfcp_erp_thread_kill(adapter);
178 out_erp_thread:
179 zfcp_adapter_debug_unregister(adapter);
180 out: 175 out:
181 up(&zfcp_data.config_sema); 176 up(&zfcp_data.config_sema);
182 return retval; 177 return retval;
@@ -199,7 +194,6 @@ zfcp_ccw_set_offline(struct ccw_device *ccw_device)
199 zfcp_erp_adapter_shutdown(adapter, 0); 194 zfcp_erp_adapter_shutdown(adapter, 0);
200 zfcp_erp_wait(adapter); 195 zfcp_erp_wait(adapter);
201 zfcp_erp_thread_kill(adapter); 196 zfcp_erp_thread_kill(adapter);
202 zfcp_adapter_debug_unregister(adapter);
203 up(&zfcp_data.config_sema); 197 up(&zfcp_data.config_sema);
204 return 0; 198 return 0;
205} 199}