From owner-svn-src-head@FreeBSD.ORG  Wed Nov 19 17:07:01 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 F28F2106564A;
	Wed, 19 Nov 2008 17:07:01 +0000 (UTC) (envelope-from raj@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E1F7B8FC1D;
	Wed, 19 Nov 2008 17:07:01 +0000 (UTC) (envelope-from raj@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 mAJH71JG022989;
	Wed, 19 Nov 2008 17:07:01 GMT (envelope-from raj@svn.freebsd.org)
Received: (from raj@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAJH71U9022988;
	Wed, 19 Nov 2008 17:07:01 GMT (envelope-from raj@svn.freebsd.org)
Message-Id: <200811191707.mAJH71U9022988@svn.freebsd.org>
From: Rafal Jaworowski <raj@FreeBSD.org>
Date: Wed, 19 Nov 2008 17:07:01 +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: r185098 - head/sys/arm/mv
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: Wed, 19 Nov 2008 17:07:02 -0000

Author: raj
Date: Wed Nov 19 17:07:01 2008
New Revision: 185098
URL: http://svn.freebsd.org/changeset/base/185098

Log:
  Improve error handling in pcib_mbus_identify().

Modified:
  head/sys/arm/mv/mv_pci.c

Modified: head/sys/arm/mv/mv_pci.c
==============================================================================
--- head/sys/arm/mv/mv_pci.c	Wed Nov 19 16:59:19 2008	(r185097)
+++ head/sys/arm/mv/mv_pci.c	Wed Nov 19 17:07:01 2008	(r185098)
@@ -369,8 +369,10 @@ pcib_mbus_identify(driver_t *driver, dev
 		    &sc->sc_rid, sc->sc_info->op_base, sc->sc_info->op_base +
 		    sc->sc_info->op_size - 1, sc->sc_info->op_size,
 		    RF_ACTIVE);
-		if (sc->sc_res == NULL)
+		if (sc->sc_res == NULL) {
 			device_printf(parent, "Could not map pcib memory\n");
+			break;
+		}
 
 		sc->sc_bst = rman_get_bustag(sc->sc_res);
 		sc->sc_bsh = rman_get_bushandle(sc->sc_res);