patch-2.4.21 linux-2.4.21/drivers/net/sunhme.c

Next file: linux-2.4.21/drivers/net/sunlance.c
Previous file: linux-2.4.21/drivers/net/sun3lance.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.20/drivers/net/sunhme.c linux-2.4.21/drivers/net/sunhme.c
@@ -523,7 +523,7 @@
 	ASD(("happy_meal_tcvr_write: reg=0x%02x value=%04x\n", reg, value));
 
 	/* Welcome to Sun Microsystems, can I take your order please? */
-	if (!hp->happy_flags & HFLAG_FENABLE)
+	if (!(hp->happy_flags & HFLAG_FENABLE))
 		return happy_meal_bb_write(hp, tregs, reg, value);
 
 	/* Would you like fries with that? */
@@ -2701,7 +2701,6 @@
 	}
 
 	hp = dev->priv;
-	memset(hp, 0, sizeof(*hp));
 
 	hp->happy_dev = sdev;
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)