From owner-svn-src-all@FreeBSD.ORG  Sat Aug 31 16:31:49 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 04120C04;
 Sat, 31 Aug 2013 16:31:49 +0000 (UTC)
 (envelope-from jhibbits@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 E64852A08;
 Sat, 31 Aug 2013 16:31:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7VGVm2V084910;
 Sat, 31 Aug 2013 16:31:48 GMT
 (envelope-from jhibbits@svn.freebsd.org)
Received: (from jhibbits@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7VGVmXk084908;
 Sat, 31 Aug 2013 16:31:48 GMT
 (envelope-from jhibbits@svn.freebsd.org)
Message-Id: <201308311631.r7VGVmXk084908@svn.freebsd.org>
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Sat, 31 Aug 2013 16:31:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255100 - head/sys/powerpc/powermac
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.14
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/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 31 Aug 2013 16:31:49 -0000

Author: jhibbits
Date: Sat Aug 31 16:31:48 2013
New Revision: 255100
URL: http://svnweb.freebsd.org/changeset/base/255100

Log:
  Only add the backlight device if it actually exists in OF.
  
  MFC after:	1 week

Modified:
  head/sys/powerpc/powermac/atibl.c
  head/sys/powerpc/powermac/nvbl.c

Modified: head/sys/powerpc/powermac/atibl.c
==============================================================================
--- head/sys/powerpc/powermac/atibl.c	Sat Aug 31 16:30:20 2013	(r255099)
+++ head/sys/powerpc/powermac/atibl.c	Sat Aug 31 16:31:48 2013	(r255100)
@@ -86,6 +86,8 @@ DRIVER_MODULE(atibl, vgapci, atibl_drive
 static void
 atibl_identify(driver_t *driver, device_t parent)
 {
+	if (OF_finddevice("mac-io/backlight") == -1)
+		return;
 	if (device_find_child(parent, "backlight", -1) == NULL)
 		device_add_child(parent, "backlight", -1);
 }

Modified: head/sys/powerpc/powermac/nvbl.c
==============================================================================
--- head/sys/powerpc/powermac/nvbl.c	Sat Aug 31 16:30:20 2013	(r255099)
+++ head/sys/powerpc/powermac/nvbl.c	Sat Aug 31 16:31:48 2013	(r255100)
@@ -82,6 +82,8 @@ DRIVER_MODULE(nvbl, vgapci, nvbl_driver,
 static void
 nvbl_identify(driver_t *driver, device_t parent)
 {
+	if (OF_finddevice("mac-io/backlight") == -1)
+		return;
 	if (device_find_child(parent, "backlight", -1) == NULL)
 		device_add_child(parent, "backlight", -1);
 }