aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorKaren Higgins <karen.higgins@qlogic.com>2010-07-10 14:51:17 +0530
committerJames Bottomley <James.Bottomley@suse.de>2010-07-28 09:05:24 -0500
commitbb6f7d5b71356be560ea84dd5a721f083d3a9e8e (patch)
tree4c5bf50011af5ee622e9386bab5825d94dd62904 /drivers
parent[SCSI] qla4xxx: replace all dev_info, dev_warn, dev_err with ql4_printk (diff)
downloadlinux-dev-bb6f7d5b71356be560ea84dd5a721f083d3a9e8e.tar.xz
linux-dev-bb6f7d5b71356be560ea84dd5a721f083d3a9e8e.zip
[SCSI] qla4xxx: wait for device_ready before device discovery
Signed-off-by: Karen Higgins <karen.higgins@qlogic.com> Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com> Reviewed-by: Mike Christie <michaelc@cs.wisc.edu> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/qla4xxx/ql4_init.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c
index 5fc19c44bada..e6b73b9fcc5a 100644
--- a/drivers/scsi/qla4xxx/ql4_init.c
+++ b/drivers/scsi/qla4xxx/ql4_init.c
@@ -991,6 +991,9 @@ static int qla4xxx_initialize_ddb_list(struct scsi_qla_host *ha)
qla4xxx_flush_AENS(ha);
+ /* Wait for an AEN */
+ qla4xxx_devices_ready(ha);
+
/*
* First perform device discovery for active
* fw ddb indexes and build
@@ -999,9 +1002,6 @@ static int qla4xxx_initialize_ddb_list(struct scsi_qla_host *ha)
if ((status = qla4xxx_build_ddb_list(ha)) == QLA_ERROR)
return status;
- /* Wait for an AEN */
- qla4xxx_devices_ready(ha);
-
/*
* Targets can come online after the inital discovery, so processing
* the aens here will catch them.