From owner-svn-src-all@FreeBSD.ORG  Wed Oct 19 23:48:15 2011
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 C2F941065675;
	Wed, 19 Oct 2011 23:48:15 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B2E948FC18;
	Wed, 19 Oct 2011 23:48:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9JNmFHF047885;
	Wed, 19 Oct 2011 23:48:15 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9JNmFvR047883;
	Wed, 19 Oct 2011 23:48:15 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201110192348.p9JNmFvR047883@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Wed, 19 Oct 2011 23:48:15 +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: r226554 - head/sys/boot/common
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: Wed, 19 Oct 2011 23:48:15 -0000

Author: pjd
Date: Wed Oct 19 23:48:15 2011
New Revision: 226554
URL: http://svn.freebsd.org/changeset/base/226554

Log:
  Fix missing return when LOADER_GPT_SUPPORT is defined, but LOADER_MBR_SUPPORT
  is not.
  
  MFC after:	3 days

Modified:
  head/sys/boot/common/disk.c

Modified: head/sys/boot/common/disk.c
==============================================================================
--- head/sys/boot/common/disk.c	Wed Oct 19 23:44:38 2011	(r226553)
+++ head/sys/boot/common/disk.c	Wed Oct 19 23:48:15 2011	(r226554)
@@ -776,9 +776,9 @@ disk_open(struct disk_devdesc *dev)
 
 #ifdef LOADER_GPT_SUPPORT
 	rc = disk_opengpt(dev);
-	if (rc)
 #endif
 #ifdef LOADER_MBR_SUPPORT
+	if (rc)
 		rc = disk_openmbr(dev);
 #endif