diff options
author | Andrew Vasquez <andrew.vasquez@qlogic.com> | 2007-05-07 10:42:58 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-08 12:20:39 -0400 |
commit | 765140bf22adfaecd7077ce10cd6198ef872094c (patch) | |
tree | 04bb3ef4ac9fdf3ebd278a8cb4d925eb26858e23 /drivers/scsi/qla2xxx/qla_os.c | |
parent | b03670e5277224d1166cb5e4f610fc388186b065 (diff) |
[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/qla2xxx/qla_os.c')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index b78919a318e2..0a36912abcd2 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) | |||
1577 | goto probe_failed; | 1577 | goto probe_failed; |
1578 | } | 1578 | } |
1579 | 1579 | ||
1580 | if (qla2x00_initialize_adapter(ha) && | 1580 | if (qla2x00_initialize_adapter(ha)) { |
1581 | !(ha->device_flags & DFLG_NO_CABLE)) { | ||
1582 | |||
1583 | qla_printk(KERN_WARNING, ha, | 1581 | qla_printk(KERN_WARNING, ha, |
1584 | "Failed to initialize adapter\n"); | 1582 | "Failed to initialize adapter\n"); |
1585 | 1583 | ||