From owner-svn-src-head@freebsd.org  Sat Jul 30 19:03:34 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0C32ABA9694;
 Sat, 30 Jul 2016 19:03:34 +0000 (UTC)
 (envelope-from ivadasz@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C7E27135C;
 Sat, 30 Jul 2016 19:03:33 +0000 (UTC)
 (envelope-from ivadasz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6UJ3WED062973;
 Sat, 30 Jul 2016 19:03:32 GMT (envelope-from ivadasz@FreeBSD.org)
Received: (from ivadasz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6UJ3Wi2062972;
 Sat, 30 Jul 2016 19:03:32 GMT (envelope-from ivadasz@FreeBSD.org)
Message-Id: <201607301903.u6UJ3Wi2062972@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ivadasz set sender to
 ivadasz@FreeBSD.org using -f
From: =?UTF-8?Q?Imre_Vad=c3=a1sz?= <ivadasz@FreeBSD.org>
Date: Sat, 30 Jul 2016 19:03:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r303557 - head/sys/dev/iwm
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.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Jul 2016 19:03:34 -0000

Author: ivadasz
Date: Sat Jul 30 19:03:32 2016
New Revision: 303557
URL: https://svnweb.freebsd.org/changeset/base/303557

Log:
  [iwm] Fix iwm_poll_bit() usage in iwm_stop_device(), fixup r303418.
  
  * iwm_poll_bit() returns 1 on success and 0 on failure, whereas
    iwl_poll_bit() in Linux's iwlwifi returns >= 0 on success and < 0 on
    failure.
  
  * Because of the wrong iwm_poll_bit return code check, no warning was
    printed if tx DMA stopping failed.
  
  Approved by:	adrian (mentor)
  Differential Revision:	https://reviews.freebsd.org/D7371

Modified:
  head/sys/dev/iwm/if_iwm.c

Modified: head/sys/dev/iwm/if_iwm.c
==============================================================================
--- head/sys/dev/iwm/if_iwm.c	Sat Jul 30 17:53:37 2016	(r303556)
+++ head/sys/dev/iwm/if_iwm.c	Sat Jul 30 19:03:32 2016	(r303557)
@@ -1310,8 +1310,8 @@ iwm_stop_device(struct iwm_softc *sc)
 		}
 
 		/* Wait for DMA channels to be idle */
-		if (iwm_poll_bit(sc, IWM_FH_TSSR_TX_STATUS_REG, mask, mask,
-		    5000) < 0) {
+		if (!iwm_poll_bit(sc, IWM_FH_TSSR_TX_STATUS_REG, mask, mask,
+		    5000)) {
 			device_printf(sc->sc_dev,
 			    "Failing on timeout while stopping DMA channel: [0x%08x]\n",
 			    IWM_READ(sc, IWM_FH_TSSR_TX_STATUS_REG));