From owner-svn-soc-all@FreeBSD.ORG  Mon May 26 12:29:33 2014
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7939A9E7
 for <svn-soc-all@FreeBSD.org>; Mon, 26 May 2014 12:29:33 +0000 (UTC)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 65A5D2D95
 for <svn-soc-all@FreeBSD.org>; Mon, 26 May 2014 12:29:33 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4QCTXiO082171
 for <svn-soc-all@FreeBSD.org>; Mon, 26 May 2014 12:29:33 GMT
 (envelope-from op@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s4QCTWeR081925
 for svn-soc-all@FreeBSD.org; Mon, 26 May 2014 12:29:32 GMT
 (envelope-from op@FreeBSD.org)
Date: Mon, 26 May 2014 12:29:32 GMT
Message-Id: <201405261229.s4QCTWeR081925@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to op@FreeBSD.org
 using -f
From: op@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r268631 - in soc2014/op/freebsd-base: . sys
 sys/dev/e1000
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 May 2014 12:29:33 -0000

Author: op
Date: Mon May 26 12:29:32 2014
New Revision: 268631
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=268631

Log:
  MFH: updated to recent FreeBSD head
  
  Signed-off-by: Oliver Pinter <oliver.pntr@gmail.com>
  
  

Modified:
  soc2014/op/freebsd-base/   (props changed)
  soc2014/op/freebsd-base/sys/   (props changed)
  soc2014/op/freebsd-base/sys/dev/e1000/e1000_phy.c

Modified: soc2014/op/freebsd-base/sys/dev/e1000/e1000_phy.c
==============================================================================
--- soc2014/op/freebsd-base/sys/dev/e1000/e1000_phy.c	Mon May 26 11:16:28 2014	(r268630)
+++ soc2014/op/freebsd-base/sys/dev/e1000/e1000_phy.c	Mon May 26 12:29:32 2014	(r268631)
@@ -4157,12 +4157,13 @@
 	*data = E1000_READ_REG(hw, E1000_MPHY_DATA);
 
 	/* Disable access to mPHY if it was originally disabled */
-	if (locked)
+	if (locked) {
 		ready = e1000_is_mphy_ready(hw);
 		if (!ready)
 			return -E1000_ERR_PHY;
 		E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL,
 				E1000_MPHY_DIS_ACCESS);
+	}
 
 	return E1000_SUCCESS;
 }
@@ -4222,12 +4223,13 @@
 	E1000_WRITE_REG(hw, E1000_MPHY_DATA, data);
 
 	/* Disable access to mPHY if it was originally disabled */
-	if (locked)
+	if (locked) {
 		ready = e1000_is_mphy_ready(hw);
 		if (!ready)
 			return -E1000_ERR_PHY;
 		E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL,
 				E1000_MPHY_DIS_ACCESS);
+	}
 
 	return E1000_SUCCESS;
 }