From owner-svn-src-all@FreeBSD.ORG  Sat Aug 18 11:33:22 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 41DE81065673;
	Sat, 18 Aug 2012 11:33:22 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2DA4F8FC14;
	Sat, 18 Aug 2012 11:33:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7IBXMhu018285;
	Sat, 18 Aug 2012 11:33:22 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7IBXLfw018283;
	Sat, 18 Aug 2012 11:33:21 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201208181133.q7IBXLfw018283@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Sat, 18 Aug 2012 11:33:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239367 - head/sys/arm/mv
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2012 11:33:22 -0000

Author: hrs
Date: Sat Aug 18 11:33:21 2012
New Revision: 239367
URL: http://svn.freebsd.org/changeset/base/239367

Log:
  Fix a bug that could fail to initialize GPIO pins specified in "gpios" because
  "gpio-controller" property at the controller node was always ignored.

Modified:
  head/sys/arm/mv/gpio.c

Modified: head/sys/arm/mv/gpio.c
==============================================================================
--- head/sys/arm/mv/gpio.c	Sat Aug 18 11:25:07 2012	(r239366)
+++ head/sys/arm/mv/gpio.c	Sat Aug 18 11:33:21 2012	(r239367)
@@ -547,7 +547,7 @@ mv_handle_gpios_prop(phandle_t ctrl, pce
 	struct mv_gpio_softc sc;
 
 	pincnt = 0;
-	if (OF_getproplen(ctrl, "gpio-controller") <= 0)
+	if (!OF_hasprop(ctrl, "gpio-controller"))
 		/* Node is not a GPIO controller. */
 		return (ENXIO);