Pull define-node-cleanup into release branch

1 files changed, 2 insertions, 3 deletions

diff --git a/arch/ia64/sn/kernel/tiocx.c b/arch/ia64/sn/kernel/tiocx.c
index e0819ec53116..0d8592a745a7 100644
--- a/arch/ia64/sn/kernel/tiocx.c
+++ b/arch/ia64/sn/kernel/tiocx.c
@@ -489,12 +489,11 @@ static int __init tiocx_init(void)
 
         bus_register(&tiocx_bus_type);
 
-        for (cnodeid = 0; cnodeid < MAX_COMPACT_NODES; cnodeid++) {
+        for (cnodeid = 0; cnodeid < num_cnodes; cnodeid++) {
                 nasid_t nasid;
                 int bt;
 
-                if ((nasid = cnodeid_to_nasid(cnodeid)) < 0)
-                        break;  /* No more nasids .. bail out of loop */
+                nasid = cnodeid_to_nasid(cnodeid);
 
                 if ((nasid & 0x1) && is_fpga_tio(nasid, &bt)) {
                         struct hubdev_info *hubdev;