diff --git a/src/drivers/net/rtl818x/rtl8185_rtl8225.c b/src/drivers/net/rtl818x/rtl8185_rtl8225.c
index 50cc84ad..ae92531c 100644
--- a/src/drivers/net/rtl818x/rtl8185_rtl8225.c
+++ b/src/drivers/net/rtl818x/rtl8185_rtl8225.c
@@ -71,7 +71,7 @@ static void rtl8225_write(struct net80211_device *dev, u8 addr, u16 data)
 	udelay(10);
 
 	for (i = 15; i >= 0; i--) {
-		u16 reg = reg80 | !!(bangdata & (1 << i));
+		u16 reg = ( reg80 | ( ( bangdata >> i ) & 1 ) );
 
 		if (i & 1)
 			rtl818x_iowrite16(priv, &priv->map->RFPinsOutput, reg);
diff --git a/src/net/fcoe.c b/src/net/fcoe.c
index d1130425..e9e404ec 100644
--- a/src/net/fcoe.c
+++ b/src/net/fcoe.c
@@ -1011,7 +1011,7 @@ static void fcoe_expired ( struct retry_timer *timer, int over __unused ) {
 	/* Increment the timeout counter */
 	fcoe->timeouts++;
 
-	if ( vlan_can_be_trunk ( fcoe->netdev ) &
+	if ( vlan_can_be_trunk ( fcoe->netdev ) &&
 	     ! ( fcoe->flags & FCOE_VLAN_TIMED_OUT ) ) {
 
 		/* If we have already found a VLAN, send infrequent