From 8c21e034cb35f0890d959ad689035f80d4bd1979 Mon Sep 17 00:00:00 2001 From: Liu Gang Date: Wed, 2 Nov 2011 13:39:05 -0700 Subject: [PATCH] --- yaml --- r: 273257 b: refs/heads/master c: a571259f4874023306db36e83054d093833b1902 h: refs/heads/master i: 273255: 22e259d6b2be1210889e2a770fa267fd9df830e8 v: v3 --- [refs] | 2 +- trunk/drivers/rapidio/rio-scan.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 81818b057010..47daec3d0f9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79975f1327850ef198ada994c2fc44b7d1ea8935 +refs/heads/master: a571259f4874023306db36e83054d093833b1902 diff --git a/trunk/drivers/rapidio/rio-scan.c b/trunk/drivers/rapidio/rio-scan.c index ebe77dd87daf..0914f49b0a53 100644 --- a/trunk/drivers/rapidio/rio-scan.c +++ b/trunk/drivers/rapidio/rio-scan.c @@ -923,7 +923,7 @@ static int __devinit rio_enum_peer(struct rio_net *net, struct rio_mport *port, * rio_enum_complete- Tests if enumeration of a network is complete * @port: Master port to send transaction * - * Tests the Component Tag CSR for non-zero value (enumeration + * Tests the PGCCSR discovered bit for non-zero value (enumeration * complete flag). Return %1 if enumeration is complete or %0 if * enumeration is incomplete. */ @@ -933,7 +933,7 @@ static int rio_enum_complete(struct rio_mport *port) rio_local_read_config_32(port, port->phys_efptr + RIO_PORT_GEN_CTL_CSR, ®val); - return (regval & RIO_PORT_GEN_MASTER) ? 1 : 0; + return (regval & RIO_PORT_GEN_DISCOVERED) ? 1 : 0; } /**