diff --git a/[refs] b/[refs]
index c9f372306732..7e502ea07787 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 388c45ccfaeec68e334ad79edeb0b5b0a43197ff
+refs/heads/master: 2d4da0fc0940625d59f014c3f85370f9b60ba7f4
diff --git a/trunk/drivers/rapidio/switches/tsi57x.c b/trunk/drivers/rapidio/switches/tsi57x.c
index d9e94920e8b0..2003fb63c404 100644
--- a/trunk/drivers/rapidio/switches/tsi57x.c
+++ b/trunk/drivers/rapidio/switches/tsi57x.c
@@ -166,7 +166,8 @@ tsi57x_em_init(struct rio_dev *rdev)
 
 	pr_debug("TSI578 %s [%d:%d]\n", __func__, destid, hopcount);
 
-	for (portnum = 0; portnum < 16; portnum++) {
+	for (portnum = 0;
+	     portnum < RIO_GET_TOTAL_PORTS(rdev->swpinfo); portnum++) {
 		/* Make sure that Port-Writes are enabled (for all ports) */
 		rio_mport_read_config_32(mport, destid, hopcount,
 				TSI578_SP_MODE(portnum), &regval);