diff --git a/[refs] b/[refs]
index d816e1226cd9..bf6a6cdb13d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ad6c75626cf8b69cd28ae0a81227503a7c3966e
+refs/heads/master: 0280f9f90b4c53e23f8ca98e581eb02f1a598a1a
diff --git a/trunk/drivers/net/3c59x.c b/trunk/drivers/net/3c59x.c
index 862f47223fdc..6f8e7d4cf74d 100644
--- a/trunk/drivers/net/3c59x.c
+++ b/trunk/drivers/net/3c59x.c
@@ -1491,7 +1491,7 @@ vortex_up(struct net_device *dev)
 	struct vortex_private *vp = netdev_priv(dev);
 	void __iomem *ioaddr = vp->ioaddr;
 	unsigned int config;
-	int i, mii_reg1, mii_reg5, err;
+	int i, mii_reg1, mii_reg5, err = 0;
 
 	if (VORTEX_PCI(vp)) {
 		pci_set_power_state(VORTEX_PCI(vp), PCI_D0);	/* Go active */