From owner-svn-src-stable@freebsd.org  Wed Mar  1 18:05:42 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 052DBCF3803;
 Wed,  1 Mar 2017 18:05:42 +0000 (UTC) (envelope-from ian@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 C888395F;
 Wed,  1 Mar 2017 18:05:41 +0000 (UTC) (envelope-from ian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v21I5ecx043403;
 Wed, 1 Mar 2017 18:05:40 GMT (envelope-from ian@FreeBSD.org)
Received: (from ian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v21I5eaQ043402;
 Wed, 1 Mar 2017 18:05:40 GMT (envelope-from ian@FreeBSD.org)
Message-Id: <201703011805.v21I5eaQ043402@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org
 using -f
From: Ian Lepore <ian@FreeBSD.org>
Date: Wed, 1 Mar 2017 18:05:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r314499 - stable/11/sys/dev/gpio
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Mar 2017 18:05:42 -0000

Author: ian
Date: Wed Mar  1 18:05:40 2017
New Revision: 314499
URL: https://svnweb.freebsd.org/changeset/base/314499

Log:
  MFC r311658:
  
    Only write to *active once, even when GPIO_ACTIVE_LOW is set.

Modified:
  stable/11/sys/dev/gpio/ofw_gpiobus.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/gpio/ofw_gpiobus.c
==============================================================================
--- stable/11/sys/dev/gpio/ofw_gpiobus.c	Wed Mar  1 18:03:34 2017	(r314498)
+++ stable/11/sys/dev/gpio/ofw_gpiobus.c	Wed Mar  1 18:05:40 2017	(r314499)
@@ -176,9 +176,10 @@ gpio_pin_is_active(gpio_pin_t pin, bool 
 		return (rv);
 	}
 
-	*active = tmp != 0;
 	if (pin->flags & GPIO_ACTIVE_LOW)
-		*active = !(*active);
+		*active = tmp == 0;
+	else
+		*active = tmp != 0;
 	return (0);
 }