From owner-svn-src-head@FreeBSD.ORG  Tue Aug 27 21:29:21 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 9300727D;
 Tue, 27 Aug 2013 21:29:21 +0000 (UTC)
 (envelope-from davidcs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7E7C123CD;
 Tue, 27 Aug 2013 21:29:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7RLTLKF072184;
 Tue, 27 Aug 2013 21:29:21 GMT (envelope-from davidcs@svn.freebsd.org)
Received: (from davidcs@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7RLTL0f072183;
 Tue, 27 Aug 2013 21:29:21 GMT (envelope-from davidcs@svn.freebsd.org)
Message-Id: <201308272129.r7RLTL0f072183@svn.freebsd.org>
From: David C Somayajulu <davidcs@FreeBSD.org>
Date: Tue, 27 Aug 2013 21:29:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r254976 - head/sys/dev/qlxgbe
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Aug 2013 21:29:21 -0000

Author: davidcs
Date: Tue Aug 27 21:29:21 2013
New Revision: 254976
URL: http://svnweb.freebsd.org/changeset/base/254976

Log:
  Fix bug in Flash access code
  
  Submitted by: David C Somayajulu

Modified:
  head/sys/dev/qlxgbe/ql_misc.c

Modified: head/sys/dev/qlxgbe/ql_misc.c
==============================================================================
--- head/sys/dev/qlxgbe/ql_misc.c	Tue Aug 27 21:28:12 2013	(r254975)
+++ head/sys/dev/qlxgbe/ql_misc.c	Tue Aug 27 21:29:21 2013	(r254976)
@@ -321,7 +321,7 @@ qla_get_fdt(qla_host_t *ha)
 
 	} while ((count < 10000) && (data32 != 0x6));
 
-	if (count == 0 && data32 != 0x6) {
+	if (data32 != 0x6) {
 		qla_sem_unlock(ha, Q8_FLASH_UNLOCK);
 		device_printf(ha->pci_dev,
 			"%s: Poll Q8_FLASH_STATUS failed\n",
@@ -401,7 +401,7 @@ qla_flash_write_enable(qla_host_t *ha, i
 
 	} while ((count < 10000) && (data32 != 0x6));
 			
-	if (count == 0 && data32 != 0x6) {
+	if (data32 != 0x6) {
 		device_printf(ha->pci_dev,
 			"%s: Poll Q8_FLASH_STATUS failed\n",
 			__func__);
@@ -432,7 +432,7 @@ qla_erase_flash_sector(qla_host_t *ha, u
 
 	} while (((count++) < 1000) && (data32 != 0x6));
 
-	if (count == 0 && data32 != 0x6) {
+	if (data32 != 0x6) {
 		device_printf(ha->pci_dev,
 			"%s: Poll Q8_FLASH_STATUS failed\n",
 			__func__);
@@ -479,7 +479,7 @@ qla_erase_flash_sector(qla_host_t *ha, u
 
 	} while (((count++) < 1000) && (data32 != 0x6));
 
-	if (count == 0 && data32 != 0x6) {
+	if (data32 != 0x6) {
 		device_printf(ha->pci_dev,
 			"%s: Poll Q8_FLASH_STATUS failed\n",
 			__func__);
@@ -575,7 +575,7 @@ qla_wr_flash32(qla_host_t *ha, uint32_t 
 
 	} while ((count < 10000) && (data32 != 0x6)); 
 
-	if (count == 0 && data32 != 0x6) {
+	if (data32 != 0x6) {
 		device_printf(ha->pci_dev,
 			"%s: Poll Q8_FLASH_STATUS failed\n",
 			__func__);