From 33ccbb51bfb98b6d77de3149784528d9dc7965fb Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jirislaby@gmail.com>
Date: Tue, 25 Aug 2009 20:54:10 +0200
Subject: [PATCH] --- yaml --- r: 163295 b: refs/heads/master c:
 9b6b93998a0d9c44d6701be5b472f3302c3a8596 h: refs/heads/master i:   163293:
 47a2a55293051d754e6891df1e228ca1966cb50e   163291:
 506cec7731e5f29c3cd3c85629a6211af963ca9b   163287:
 2cf79bf0fd6c6f9945ef133d613e151a2dd51024   163279:
 f48c1c34b3af6fbb962e2d75745bb23158a0343f   163263:
 c97b5ee23bf2303bdf9eaa454338a25af4be896b v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/ia64/sn/pci/pcibr/pcibr_ate.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5f9502a507cc..aed00b27e204 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0cced40e7c58b1105aef3ca446da7b158a18a9a6
+refs/heads/master: 9b6b93998a0d9c44d6701be5b472f3302c3a8596
diff --git a/trunk/arch/ia64/sn/pci/pcibr/pcibr_ate.c b/trunk/arch/ia64/sn/pci/pcibr/pcibr_ate.c
index 239b3cedcf2b..5bc34eac9e01 100644
--- a/trunk/arch/ia64/sn/pci/pcibr/pcibr_ate.c
+++ b/trunk/arch/ia64/sn/pci/pcibr/pcibr_ate.c
@@ -54,6 +54,8 @@ static int find_free_ate(struct ate_resource *ate_resource, int start,
 					break;
 				}
 			}
+			if (i >= ate_resource->num_ate)
+				return -1;
 		} else
 			index++;	/* Try next ate */
 	}