Merge branch 'proc' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc

[linux-2.6-omap-h63xx.git] / drivers / rapidio / rio.c

diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c
index 80c5f1ba2e49c4045269085b33155239f8d7cd9f..680661abbc4b700ce537a8ad828124be26821187 100644 (file)
--- a/drivers/rapidio/rio.c
+++ b/drivers/rapidio/rio.c
@@ -43,7 +43,7 @@ u16 rio_local_get_device_id(struct rio_mport *port)
 
        rio_local_read_config_32(port, RIO_DID_CSR, &result);
 
-       return (RIO_GET_DID(result));
+       return (RIO_GET_DID(port->sys_size, result));
 }
 
 /**