From ff6959ae0c41a5c036b48642ab45c1e15914d57a Mon Sep 17 00:00:00 2001
From: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Tue, 12 Jan 2010 12:59:49 -0800
Subject: [PATCH] --- yaml --- r: 180001 b: refs/heads/master c:
 368bbe077739fa1ef6fc0195b2810ed50ef87df6 h: refs/heads/master i:   179999:
 0f20d0d4ef94e45258b8c75d12eb4773763c9701 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/scsi/qla2xxx/qla_sup.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e55a4f9f36e5..32bebd22a7e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f08b7251c40090b8c522a306642944cd7322eebb
+refs/heads/master: 368bbe077739fa1ef6fc0195b2810ed50ef87df6
diff --git a/trunk/drivers/scsi/qla2xxx/qla_sup.c b/trunk/drivers/scsi/qla2xxx/qla_sup.c
index 010e69b29afe..371dc895972a 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_sup.c
+++ b/trunk/drivers/scsi/qla2xxx/qla_sup.c
@@ -2292,11 +2292,14 @@ qla25xx_read_optrom_data(struct scsi_qla_host *vha, uint8_t *buf,
 	uint32_t faddr, left, burst;
 	struct qla_hw_data *ha = vha->hw;
 
+	if (IS_QLA25XX(ha) || IS_QLA81XX(ha))
+		goto try_fast;
 	if (offset & 0xfff)
 		goto slow_read;
 	if (length < OPTROM_BURST_SIZE)
 		goto slow_read;
 
+try_fast:
 	optrom = dma_alloc_coherent(&ha->pdev->dev, OPTROM_BURST_SIZE,
 	    &optrom_dma, GFP_KERNEL);
 	if (!optrom) {