Skip to content

Commit

Permalink
Staging: et131x: fix | vs & typos
Browse files Browse the repository at this point in the history
These two places seem like they should be using bitwise OR instead of
bitwise AND.  The first one is a noop which is equivalent to:

	imr |= (0x0100 & 0x0004 & 0x0001);

The second is sets lcr2 to zero instead of just clearing the high bits.

	lcr2 &= (0x00F0 & 0x000F);

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Dan Carpenter authored and Greg Kroah-Hartman committed Jun 11, 2012
1 parent 397d3e6 commit b5b86a4
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/staging/et131x/et131x.c
Original file line number Diff line number Diff line change
Expand Up @@ -1766,8 +1766,8 @@ static void et131x_xcvr_init(struct et131x_adapter *adapter)
/* Set the link status interrupt only. Bad behavior when link status
* and auto neg are set, we run into a nested interrupt problem
*/
imr |= (ET_PHY_INT_MASK_AUTONEGSTAT &
ET_PHY_INT_MASK_LINKSTAT &
imr |= (ET_PHY_INT_MASK_AUTONEGSTAT |
ET_PHY_INT_MASK_LINKSTAT |
ET_PHY_INT_MASK_ENABLE);

et131x_mii_write(adapter, PHY_INTERRUPT_MASK, imr);
Expand All @@ -1783,7 +1783,7 @@ static void et131x_xcvr_init(struct et131x_adapter *adapter)
if ((adapter->eeprom_data[1] & 0x4) == 0) {
et131x_mii_read(adapter, PHY_LED_2, &lcr2);

lcr2 &= (ET_LED2_LED_100TX & ET_LED2_LED_1000T);
lcr2 &= (ET_LED2_LED_100TX | ET_LED2_LED_1000T);
lcr2 |= (LED_VAL_LINKON_ACTIVE << LED_LINK_SHIFT);

if ((adapter->eeprom_data[1] & 0x8) == 0)
Expand Down

0 comments on commit b5b86a4

Please sign in to comment.