summaryrefslogtreecommitdiff
path: root/drivers/scsi
diff options
context:
space:
mode:
authorAndrew Vasquez <andrew.vasquez@qlogic.com>2007-05-07 07:42:58 -0700
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2007-05-08 11:20:39 -0500
commit765140bf22adfaecd7077ce10cd6198ef872094c (patch)
tree04bb3ef4ac9fdf3ebd278a8cb4d925eb26858e23 /drivers/scsi
parentb03670e5277224d1166cb5e4f610fc388186b065 (diff)
downloadlinux-3.10-765140bf22adfaecd7077ce10cd6198ef872094c.tar.gz
linux-3.10-765140bf22adfaecd7077ce10cd6198ef872094c.tar.bz2
linux-3.10-765140bf22adfaecd7077ce10cd6198ef872094c.zip
[SCSI] qla2xxx: Error-out during probe() if we're unable to complete HBA initialization.
Remove a stale check against ha->device_flags (DFLG_NO_CABLE) as topology scanning is performed within the DPC-thread context. Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/qla2xxx/qla_os.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index b78919a318e..0a36912abcd 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1577,9 +1577,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
goto probe_failed;
}
- if (qla2x00_initialize_adapter(ha) &&
- !(ha->device_flags & DFLG_NO_CABLE)) {
-
+ if (qla2x00_initialize_adapter(ha)) {
qla_printk(KERN_WARNING, ha,
"Failed to initialize adapter\n");