1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c
index 2bebd791a092..02e686b4c19a 100644
--- a/drivers/rapidio/rio-scan.c
+++ b/drivers/rapidio/rio-scan.c
@@ -839,12 +839,10 @@ static int __devinit rio_enum_peer(struct rio_net *net, struct rio_mport *port,
                 for (port_num = 0;
                      port_num < RIO_GET_TOTAL_PORTS(rdev->swpinfo);
                      port_num++) {
-                        /*Enable Input Output Port (transmitter reviever)*/
-                        rio_enable_rx_tx_port(port, 0,
+                        if (sw_inport == port_num) {
+                                rio_enable_rx_tx_port(port, 0,
                                               RIO_ANY_DESTID(port->sys_size),
                                               hopcount, port_num);
-
-                        if (sw_inport == port_num) {
                                 rdev->rswitch->port_ok |= (1 << port_num);
                                 continue;
                         }
@@ -857,6 +855,9 @@ static int __devinit rio_enum_peer(struct rio_net *net, struct rio_mport *port,
                                 pr_debug(
                                     "RIO: scanning device on port %d\n",
                                     port_num);
+                                rio_enable_rx_tx_port(port, 0,
+                                              RIO_ANY_DESTID(port->sys_size),
+                                              hopcount, port_num);
                                 rdev->rswitch->port_ok |= (1 << port_num);
                                 rio_route_add_entry(rdev, RIO_GLOBAL_TABLE,
                                                 RIO_ANY_DESTID(port->sys_size),