git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
drivers
/
staging
/
octeon
/
cvmx-mdio.h
diff --git
a/drivers/staging/octeon/cvmx-mdio.h
b/drivers/staging/octeon/cvmx-mdio.h
index
c987a75
..
f45dc49
100644
(file)
--- a/
drivers/staging/octeon/cvmx-mdio.h
+++ b/
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 "