From 9d0d6ae6d3d9bc9ee9212530365f5b6b295566c7 Mon Sep 17 00:00:00 2001
From: roel kluin <roel.kluin@gmail.com>
Date: Sat, 25 Jul 2009 12:38:33 +0000
Subject: [PATCH] --- yaml --- r: 155882 b: refs/heads/master c:
 c65d3198addb1a2862d4b88bc2a74ac9cbed66f9 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/net/tokenring/ibmtr.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 63cc86f20e56..6bef3074a4b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b73e79b0dcc86f8bec68a34b7fb812eec953f34
+refs/heads/master: c65d3198addb1a2862d4b88bc2a74ac9cbed66f9
diff --git a/trunk/drivers/net/tokenring/ibmtr.c b/trunk/drivers/net/tokenring/ibmtr.c
index 9d896116cf76..08a6c41c1599 100644
--- a/trunk/drivers/net/tokenring/ibmtr.c
+++ b/trunk/drivers/net/tokenring/ibmtr.c
@@ -1912,7 +1912,7 @@ static int __init ibmtr_init(void)
 
 	find_turbo_adapters(io);
 
-	for (i = 0; io[i] && (i < IBMTR_MAX_ADAPTERS); i++) {
+	for (i = 0; i < IBMTR_MAX_ADAPTERS && io[i]; i++) {
 		struct net_device *dev;
 		irq[i] = 0;
 		mem[i] = 0;