[SCSI] qla2xxx: Error-out during probe() if we're unable to complete HBA initialization.

avasquez01 · James Bottomley · commit 765140bf22ad · 2007-05-08T11:20:39.000-05:00
Remove a stale check against ha-&gt;device_flags
(DFLG_NO_CABLE) as topology scanning is performed within the
DPC-thread context.

Signed-off-by: Andrew Vasquez &lt;andrew.vasquez@qlogic.com&gt;
Signed-off-by: James Bottomley &lt;James.Bottomley@SteelEye.com&gt;
diff --git 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");
 

Original file line number	Diff line number	Diff line change
`@@ -1577,9 +1577,7 @@ qla2x00_probe_one(struct pci_dev pdev, const struct pci_device_id id)`
`1577`	`1577`	`goto probe_failed;`
`1578`	`1578`	`}`
`1579`	`1579`
`1580`		`- if (qla2x00_initialize_adapter(ha) &&`
`1581`		`- !(ha->device_flags & DFLG_NO_CABLE)) {`
`1582`		`-`
	`1580`	`+ if (qla2x00_initialize_adapter(ha)) {`
`1583`	`1581`	`qla_printk(KERN_WARNING, ha,`
`1584`	`1582`	`"Failed to initialize adapter\n");`
`1585`	`1583`