aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/scsi/zfcp_ccw.c
diff options
context:
space:
mode:
authorChristof Schmitt <christof.schmitt@de.ibm.com>2007-08-28 03:31:41 -0400
committerJames Bottomley <jejb@mulgrave.localdomain>2007-10-12 14:46:36 -0400
commitff17a29d3cd9819a0977a07047e8f54e57dca7ce (patch)
treeea363cbf6da639fc49bc2f4dd635e2d9f132858c /drivers/s390/scsi/zfcp_ccw.c
parent52ef11a7170e1b8a0d5f9a42dbb43c38c335c32e (diff)
[SCSI] zfcp: Enable debug feature before setting adapter online
Already register the debug feature before the zfcp adapter is set online. This allows to use the debug feature to investigate the online/offline sequence. Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com> Signed-off-by: Swen Schillig <swen@vnet.ibm.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
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 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)
150 down(&zfcp_data.config_sema); 150 down(&zfcp_data.config_sema);
151 adapter = dev_get_drvdata(&ccw_device->dev); 151 adapter = dev_get_drvdata(&ccw_device->dev);
152 152
153 retval = zfcp_adapter_debug_register(adapter);
154 if (retval)
155 goto out;
156 retval = zfcp_erp_thread_setup(adapter); 153 retval = zfcp_erp_thread_setup(adapter);
157 if (retval) { 154 if (retval) {
158 ZFCP_LOG_INFO("error: start of error recovery thread for " 155 ZFCP_LOG_INFO("error: start of error recovery thread for "
159 "adapter %s failed\n", 156 "adapter %s failed\n",
160 zfcp_get_busid_by_adapter(adapter)); 157 zfcp_get_busid_by_adapter(adapter));
161 goto out_erp_thread; 158 goto out;
162 } 159 }
163 160
164 retval = zfcp_adapter_scsi_register(adapter); 161 retval = zfcp_adapter_scsi_register(adapter);
@@ -177,8 +174,6 @@ zfcp_ccw_set_online(struct ccw_device *ccw_device)
177 174
178 out_scsi_register: 175 out_scsi_register:
179 zfcp_erp_thread_kill(adapter); 176 zfcp_erp_thread_kill(adapter);
180 out_erp_thread:
181 zfcp_adapter_debug_unregister(adapter);
182 out: 177 out:
183 up(&zfcp_data.config_sema); 178 up(&zfcp_data.config_sema);
184 return retval; 179 return retval;
@@ -201,7 +196,6 @@ zfcp_ccw_set_offline(struct ccw_device *ccw_device)
201 zfcp_erp_adapter_shutdown(adapter, 0); 196 zfcp_erp_adapter_shutdown(adapter, 0);
202 zfcp_erp_wait(adapter); 197 zfcp_erp_wait(adapter);
203 zfcp_erp_thread_kill(adapter); 198 zfcp_erp_thread_kill(adapter);
204 zfcp_adapter_debug_unregister(adapter);
205 up(&zfcp_data.config_sema); 199 up(&zfcp_data.config_sema);
206 return 0; 200 return 0;
207} 201}