From owner-svn-src-all@freebsd.org  Mon Sep 19 22:13:09 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 7F454BE0E23;
 Mon, 19 Sep 2016 22:13:09 +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 500D5FFC;
 Mon, 19 Sep 2016 22:13:09 +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 u8JMD8qQ074182;
 Mon, 19 Sep 2016 22:13:08 GMT (envelope-from ivadasz@FreeBSD.org)
Received: (from ivadasz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8JMD8mh074181;
 Mon, 19 Sep 2016 22:13:08 GMT (envelope-from ivadasz@FreeBSD.org)
Message-Id: <201609192213.u8JMD8mh074181@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: Mon, 19 Sep 2016 22:13:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r306002 - 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-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Sep 2016 22:13:09 -0000

Author: ivadasz
Date: Mon Sep 19 22:13:08 2016
New Revision: 306002
URL: https://svnweb.freebsd.org/changeset/base/306002

Log:
  [iwm] Fix iwm_poll_bit() error value check in iwm_attach().
  
  The iwm(4) iwm_poll_bit() function returns 1 on success, and 0 on failure,
  whereas the iwl_poll_bit() in Linux iwlwifi returns < 0 on failure.
  
  So the (ret < 0) check ended up ignoring any error returned by
  iwm_poll_bit().
  
  Approved by:	adrian (mentor)
  Differential Revision:	https://reviews.freebsd.org/D7932

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

Modified: head/sys/dev/iwm/if_iwm.c
==============================================================================
--- head/sys/dev/iwm/if_iwm.c	Mon Sep 19 22:11:34 2016	(r306001)
+++ head/sys/dev/iwm/if_iwm.c	Mon Sep 19 22:13:08 2016	(r306002)
@@ -5762,7 +5762,7 @@ iwm_attach(device_t dev)
 				   IWM_CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
 				   IWM_CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
 				   25000);
-		if (ret < 0) {
+		if (!ret) {
 			device_printf(sc->sc_dev,
 			    "Failed to wake up the nic\n");
 			goto fail;