aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/rapidio/rio-scan.c6
-rw-r--r--drivers/rapidio/rio.c2
-rw-r--r--drivers/rapidio/rio.h2
3 files changed, 9 insertions, 1 deletions
diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c
index d2ea01872d6a..e3efdf93df5a 100644
--- a/drivers/rapidio/rio-scan.c
+++ b/drivers/rapidio/rio-scan.c
@@ -762,6 +762,12 @@ static int __devinit rio_enum_peer(struct rio_net *net, struct rio_mport *port,
762 u16 destid; 762 u16 destid;
763 int tmp; 763 int tmp;
764 764
765 if (rio_mport_chk_dev_access(port,
766 RIO_ANY_DESTID(port->sys_size), hopcount)) {
767 pr_debug("RIO: device access check failed\n");
768 return -1;
769 }
770
765 if (rio_get_host_deviceid_lock(port, hopcount) == port->host_deviceid) { 771 if (rio_get_host_deviceid_lock(port, hopcount) == port->host_deviceid) {
766 pr_debug("RIO: PE already discovered by this host\n"); 772 pr_debug("RIO: PE already discovered by this host\n");
767 /* 773 /*
diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c
index aefc2a0004d4..fa5e3cbe4c83 100644
--- a/drivers/rapidio/rio.c
+++ b/drivers/rapidio/rio.c
@@ -546,7 +546,7 @@ err_out:
546 * @destid: Device destination ID in network 546 * @destid: Device destination ID in network
547 * @hopcount: Number of hops into the network 547 * @hopcount: Number of hops into the network
548 */ 548 */
549static int 549int
550rio_mport_chk_dev_access(struct rio_mport *mport, u16 destid, u8 hopcount) 550rio_mport_chk_dev_access(struct rio_mport *mport, u16 destid, u8 hopcount)
551{ 551{
552 int i = 0; 552 int i = 0;
diff --git a/drivers/rapidio/rio.h b/drivers/rapidio/rio.h
index bc71ba1d239e..d249a1205c7d 100644
--- a/drivers/rapidio/rio.h
+++ b/drivers/rapidio/rio.h
@@ -24,6 +24,8 @@ extern u32 rio_mport_get_physefb(struct rio_mport *port, int local,
24 u16 destid, u8 hopcount); 24 u16 destid, u8 hopcount);
25extern u32 rio_mport_get_efb(struct rio_mport *port, int local, u16 destid, 25extern u32 rio_mport_get_efb(struct rio_mport *port, int local, u16 destid,
26 u8 hopcount, u32 from); 26 u8 hopcount, u32 from);
27extern int rio_mport_chk_dev_access(struct rio_mport *mport, u16 destid,
28 u8 hopcount);
27extern int rio_create_sysfs_dev_files(struct rio_dev *rdev); 29extern int rio_create_sysfs_dev_files(struct rio_dev *rdev);
28extern int rio_enum_mport(struct rio_mport *mport); 30extern int rio_enum_mport(struct rio_mport *mport);
29extern int rio_disc_mport(struct rio_mport *mport); 31extern int rio_disc_mport(struct rio_mport *mport);