Merge branch 'linus' into x86/mm

Conflicts:
	arch/x86/mm/fault.c

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c
index 6e8f377355fe..fe0c3f244562 100644
--- a/drivers/net/sunqe.c
+++ b/drivers/net/sunqe.c
@@ -227,7 +227,7 @@ static int qe_init(struct sunqe *qep, int from_irq)
         if (!(sbus_readb(mregs + MREGS_PHYCONFIG) & MREGS_PHYCONFIG_LTESTDIS)) {
                 int tries = 50;
 
-                while (tries--) {
+                while (--tries) {
                         u8 tmp;
 
                         mdelay(5);