From b9dd3ca9879d171f48dc715c1cb3591762c94d1a Mon Sep 17 00:00:00 2001 From: Andrew Vasquez Date: Mon, 7 May 2007 07:42:58 -0700 Subject: [PATCH] --- yaml --- r: 55234 b: refs/heads/master c: 765140bf22adfaecd7077ce10cd6198ef872094c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla2xxx/qla_os.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 27d8c063a00f..98e91b1849a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b03670e5277224d1166cb5e4f610fc388186b065 +refs/heads/master: 765140bf22adfaecd7077ce10cd6198ef872094c diff --git a/trunk/drivers/scsi/qla2xxx/qla_os.c b/trunk/drivers/scsi/qla2xxx/qla_os.c index b78919a318e2..0a36912abcd2 100644 --- a/trunk/drivers/scsi/qla2xxx/qla_os.c +++ b/trunk/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");