diff --git a/[refs] b/[refs]
index c9d79cc252ce..3f1f72d6eadc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3bf887d73309808d47c74f2f024d2497c8f7048
+refs/heads/master: fff9c815291d5f4132976ac337337ea5813663e6
diff --git a/trunk/drivers/staging/octeon/cvmx-mdio.h b/trunk/drivers/staging/octeon/cvmx-mdio.h
index c987a75a20cf..f45dc49512f2 100644
--- a/trunk/drivers/staging/octeon/cvmx-mdio.h
+++ b/trunk/drivers/staging/octeon/cvmx-mdio.h
@@ -421,7 +421,7 @@ static inline int cvmx_mdio_45_read(int bus_id, int phy_id, int device,
 	do {
 		cvmx_wait(1000);
 		smi_rd.u64 = cvmx_read_csr(CVMX_SMIX_RD_DAT(bus_id));
-	} while (smi_rd.s.pending && timeout--);
+	} while (smi_rd.s.pending && --timeout);
 
 	if (timeout <= 0) {
 		cvmx_dprintf("cvmx_mdio_45_read: bus_id %d phy_id %2d "