From owner-svn-src-head@FreeBSD.ORG  Thu Dec 12 14:49:27 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5BE27A5;
 Thu, 12 Dec 2013 14:49:27 +0000 (UTC)
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 480F117D1;
 Thu, 12 Dec 2013 14:49:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBCEnRoK045691;
 Thu, 12 Dec 2013 14:49:27 GMT (envelope-from ray@svn.freebsd.org)
Received: (from ray@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBCEnRRQ045690;
 Thu, 12 Dec 2013 14:49:27 GMT (envelope-from ray@svn.freebsd.org)
Message-Id: <201312121449.rBCEnRRQ045690@svn.freebsd.org>
From: Aleksandr Rybalko <ray@FreeBSD.org>
Date: Thu, 12 Dec 2013 14:49:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r259261 - head/sys/dev/drm2
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.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Dec 2013 14:49:27 -0000

Author: ray
Date: Thu Dec 12 14:49:26 2013
New Revision: 259261
URL: http://svnweb.freebsd.org/changeset/base/259261

Log:
  Do not try to probe/attach if attempt to add fbd child are failed.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/dev/drm2/drm_fb_helper.c

Modified: head/sys/dev/drm2/drm_fb_helper.c
==============================================================================
--- head/sys/dev/drm2/drm_fb_helper.c	Thu Dec 12 14:37:25 2013	(r259260)
+++ head/sys/dev/drm2/drm_fb_helper.c	Thu Dec 12 14:49:26 2013	(r259261)
@@ -1043,7 +1043,10 @@ int drm_fb_helper_single_fb_probe(struct
 
 		kdev = fb_helper->dev->device;
 		fbd = device_add_child(kdev, "fbd", device_get_unit(kdev));
-		ret = device_probe_and_attach(fbd);
+		if (fbd != NULL) 
+			ret = device_probe_and_attach(fbd);
+		else
+			ret = ENODEV;
 #ifdef DEV_VT
 		if (ret != 0)
 			DRM_ERROR("Failed to attach fbd device: %d\n", ret);