From caf062c8849111aa730ee6fa188980527e7f4386 Mon Sep 17 00:00:00 2001
From: Roel Kluin <roel.kluin@gmail.com>
Date: Sun, 2 Aug 2009 08:02:28 +0000
Subject: [PATCH] --- yaml --- r: 156267 b: refs/heads/master c:
 447c233da4d109c6194fefd69e5185cbc93cc062 h: refs/heads/master i:   156265:
 cdb502b51796ac318ccc9c4ed23f20181d132902   156263:
 bab0f996c1f8b46582e615babc9de26d56556451 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/parisc/pdc_stable.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 62e79b9d746e..f17f6f6e7e8d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4f2e2ad5348063ef94aa623f6f09b52ecaf0990
+refs/heads/master: 447c233da4d109c6194fefd69e5185cbc93cc062
diff --git a/trunk/drivers/parisc/pdc_stable.c b/trunk/drivers/parisc/pdc_stable.c
index f9f9a5f1bbd0..13a64bc081b6 100644
--- a/trunk/drivers/parisc/pdc_stable.c
+++ b/trunk/drivers/parisc/pdc_stable.c
@@ -370,7 +370,7 @@ pdcspath_layer_read(struct pdcspath_entry *entry, char *buf)
 	if (!i)	/* entry is not ready */
 		return -ENODATA;
 	
-	for (i = 0; devpath->layers[i] && (likely(i < 6)); i++)
+	for (i = 0; i < 6 && devpath->layers[i]; i++)
 		out += sprintf(out, "%u ", devpath->layers[i]);
 
 	out += sprintf(out, "\n");