socsvn commit: r268631 - in soc2014/op/freebsd-base: . sys sys/dev/e1000

[op at FreeBSD.org]

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 at 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;
 }