Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 19 Oct 2011 23:48:15 +0000 (UTC)
From:      Pawel Jakub Dawidek <pjd@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r226554 - head/sys/boot/common
Message-ID:  <201110192348.p9JNmFvR047883@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110192348.p9JNmFvR047883>