From 285b6b322b9882e29ee69664f1aae258a475c9e6 Mon Sep 17 00:00:00 2001
From: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Thu, 24 Jul 2008 08:31:46 -0700
Subject: [PATCH] --- yaml --- r: 106603 b: refs/heads/master c:
 8201e207997b4665a5fcb375bab293fddb2e6adb h: refs/heads/master i:   106601:
 8ab62e9aab539f1f7b1cdf7f69fcee53081d11ee   106599:
 5d0966e8a33366108a6f5e7a3e9293f4108c6530 v: v3

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

diff --git a/[refs] b/[refs]
index d4db91437ccc..6a9919b34ad3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d164fb09bb5cb8a223eddf634fc0d355714fcfe
+refs/heads/master: 8201e207997b4665a5fcb375bab293fddb2e6adb
diff --git a/trunk/drivers/scsi/qla2xxx/qla_init.c b/trunk/drivers/scsi/qla2xxx/qla_init.c
index 44c0117c5d2b..597ac201969c 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_init.c
+++ b/trunk/drivers/scsi/qla2xxx/qla_init.c
@@ -4038,8 +4038,8 @@ qla2x00_try_to_stop_firmware(scsi_qla_host_t *ha)
 	ret = qla2x00_stop_firmware(ha);
 	for (retries = 5; ret != QLA_SUCCESS && ret != QLA_FUNCTION_TIMEOUT &&
 	    retries ; retries--) {
-		qla2x00_reset_chip(ha);
-		if (qla2x00_chip_diag(ha) != QLA_SUCCESS)
+		ha->isp_ops->reset_chip(ha);
+		if (ha->isp_ops->chip_diag(ha) != QLA_SUCCESS)
 			continue;
 		if (qla2x00_setup_chip(ha) != QLA_SUCCESS)
 			continue;