From owner-svn-src-user@FreeBSD.ORG  Sat Nov  2 14:05:20 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@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 ESMTP id 3E9DC588;
 Sat,  2 Nov 2013 14:05:20 +0000 (UTC) (envelope-from ray@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 2CB6E2703;
 Sat,  2 Nov 2013 14:05:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA2E5KME099076;
 Sat, 2 Nov 2013 14:05:20 GMT (envelope-from ray@svn.freebsd.org)
Received: (from ray@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA2E5KmJ099075;
 Sat, 2 Nov 2013 14:05:20 GMT (envelope-from ray@svn.freebsd.org)
Message-Id: <201311021405.rA2E5KmJ099075@svn.freebsd.org>
From: Aleksandr Rybalko <ray@FreeBSD.org>
Date: Sat, 2 Nov 2013 14:05:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r257546 - user/ed/newcons/sys/dev/fb
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 02 Nov 2013 14:05:20 -0000

Author: ray
Date: Sat Nov  2 14:05:19 2013
New Revision: 257546
URL: http://svnweb.freebsd.org/changeset/base/257546

Log:
  Fail to attach if fb_info not passed.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  user/ed/newcons/sys/dev/fb/fbd.c

Modified: user/ed/newcons/sys/dev/fb/fbd.c
==============================================================================
--- user/ed/newcons/sys/dev/fb/fbd.c	Sat Nov  2 13:16:00 2013	(r257545)
+++ user/ed/newcons/sys/dev/fb/fbd.c	Sat Nov  2 14:05:19 2013	(r257546)
@@ -372,6 +372,8 @@ fbd_attach(device_t dev)
 
 	sc->sc_dev = dev;
 	sc->sc_info = FB_GETINFO(device_get_parent(dev));
+	if (sc->sc_info == NULL)
+		return (ENXIO);
 	err = fbd_register(sc->sc_info);
 
 	return (err);