From owner-svn-src-all@FreeBSD.ORG  Thu Oct 20 15:46:54 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 6A9F4106564A;
	Thu, 20 Oct 2011 15:46:54 +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 5A9A68FC0A;
	Thu, 20 Oct 2011 15:46:54 +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 p9KFkstP080951;
	Thu, 20 Oct 2011 15:46:54 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9KFksT4080949;
	Thu, 20 Oct 2011 15:46:54 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201110201546.p9KFksT4080949@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Thu, 20 Oct 2011 15:46:54 +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: r226569 - 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: Thu, 20 Oct 2011 15:46:54 -0000

Author: pjd
Date: Thu Oct 20 15:46:54 2011
New Revision: 226569
URL: http://svn.freebsd.org/changeset/base/226569

Log:
  With LOADER_MBR_SUPPORT defined and LOADER_GPT_SUPPORT undefined we would
  never call disk_openmbr().
  
  Submitted by:	avg
  MFC after:	3 days

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

Modified: head/sys/boot/common/disk.c
==============================================================================
--- head/sys/boot/common/disk.c	Thu Oct 20 15:42:38 2011	(r226568)
+++ head/sys/boot/common/disk.c	Thu Oct 20 15:46:54 2011	(r226569)
@@ -776,10 +776,11 @@ disk_open(struct disk_devdesc *dev)
 
 #ifdef LOADER_GPT_SUPPORT
 	rc = disk_opengpt(dev);
+	if (rc == 0)
+		return (0);
 #endif
 #ifdef LOADER_MBR_SUPPORT
-	if (rc)
-		rc = disk_openmbr(dev);
+	rc = disk_openmbr(dev);
 #endif
 
 	return (rc);