From owner-svn-src-all@FreeBSD.ORG  Sun Jan 18 12:12:38 2009
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 A72681065670;
	Sun, 18 Jan 2009 12:12:38 +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 946508FC14;
	Sun, 18 Jan 2009 12:12:38 +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 n0ICCcwO073048;
	Sun, 18 Jan 2009 12:12:38 GMT (envelope-from stas@svn.freebsd.org)
Received: (from stas@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0ICCcRa073047;
	Sun, 18 Jan 2009 12:12:38 GMT (envelope-from stas@svn.freebsd.org)
Message-Id: <200901181212.n0ICCcRa073047@svn.freebsd.org>
From: Stanislav Sedov <stas@FreeBSD.org>
Date: Sun, 18 Jan 2009 12:12:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187389 - in stable/7/sys: . arm/at91 contrib/pf
	dev/ath/ath_hal dev/cxgb
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: Sun, 18 Jan 2009 12:12:39 -0000

Author: stas
Date: Sun Jan 18 12:12:38 2009
New Revision: 187389
URL: http://svn.freebsd.org/changeset/base/187389

Log:
  - Merge r184309:
    Add a missing NULL-pointer check.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/arm/at91/at91.c
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/arm/at91/at91.c
==============================================================================
--- stable/7/sys/arm/at91/at91.c	Sun Jan 18 12:09:24 2009	(r187388)
+++ stable/7/sys/arm/at91/at91.c	Sun Jan 18 12:12:38 2009	(r187389)
@@ -577,8 +577,10 @@ at91_alloc_resource(device_t dev, device
 #endif
 			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) {