From owner-svn-src-head@FreeBSD.ORG  Sun Oct 26 22:52:57 2008
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 64813106567A;
	Sun, 26 Oct 2008 22:52:57 +0000 (UTC)
	(envelope-from stas@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 52D148FC08;
	Sun, 26 Oct 2008 22:52:57 +0000 (UTC)
	(envelope-from stas@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9QMqv8R000294;
	Sun, 26 Oct 2008 22:52:57 GMT (envelope-from stas@svn.freebsd.org)
Received: (from stas@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9QMqvXF000293;
	Sun, 26 Oct 2008 22:52:57 GMT (envelope-from stas@svn.freebsd.org)
Message-Id: <200810262252.m9QMqvXF000293@svn.freebsd.org>
From: Stanislav Sedov <stas@FreeBSD.org>
Date: Sun, 26 Oct 2008 22:52:57 +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: r184309 - head/sys/arm/at91
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sun, 26 Oct 2008 22:52:57 -0000

Author: stas
Date: Sun Oct 26 22:52:57 2008
New Revision: 184309
URL: http://svn.freebsd.org/changeset/base/184309

Log:
  - Add a missing NULL-pointer check.
  
  Reviewed by:	cognet
  Approved by:	kib (mentor, implicit)
  MFC after:	3 days

Modified:
  head/sys/arm/at91/at91.c

Modified: head/sys/arm/at91/at91.c
==============================================================================
--- head/sys/arm/at91/at91.c	Sun Oct 26 22:46:37 2008	(r184308)
+++ head/sys/arm/at91/at91.c	Sun Oct 26 22:52:57 2008	(r184309)
@@ -534,8 +534,10 @@ at91_alloc_resource(device_t dev, device
 	case SYS_RES_MEMORY:
 		rle->res = rman_reserve_resource(&sc->sc_mem_rman,
 		    start, end, count, flags, child);
-		rman_set_bustag(rle->res, &at91_bs_tag);
-		rman_set_bushandle(rle->res, start);
+		if (rle->res != NULL) {
+			rman_set_bustag(rle->res, &at91_bs_tag);
+			rman_set_bushandle(rle->res, start);
+		}
 		break;
 	}
 	if (rle->res) {