Date: Mon, 26 May 2014 02:19:50 +0000 (UTC) From: Eitan Adler <eadler@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r266677 - head/sys/dev/e1000 Message-ID: <201405260219.s4Q2Jopj006928@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: eadler Date: Mon May 26 02:19:50 2014 New Revision: 266677 URL: http://svnweb.freebsd.org/changeset/base/266677 Log: e1000: add missing braces Obtained from: DragonFlyBSD Modified: head/sys/dev/e1000/e1000_phy.c Modified: head/sys/dev/e1000/e1000_phy.c ============================================================================== --- head/sys/dev/e1000/e1000_phy.c Mon May 26 01:37:43 2014 (r266676) +++ head/sys/dev/e1000/e1000_phy.c Mon May 26 02:19:50 2014 (r266677) @@ -4157,12 +4157,13 @@ s32 e1000_read_phy_reg_mphy(struct e1000 *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 @@ s32 e1000_write_phy_reg_mphy(struct e100 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; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405260219.s4Q2Jopj006928>