git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/master' into next
[pandora-kernel.git]
/
drivers
/
rapidio
/
rio-sysfs.c
diff --git
a/drivers/rapidio/rio-sysfs.c
b/drivers/rapidio/rio-sysfs.c
index
659e311
..
ba742e8
100644
(file)
--- a/
drivers/rapidio/rio-sysfs.c
+++ b/
drivers/rapidio/rio-sysfs.c
@@
-43,7
+43,8
@@
static ssize_t routes_show(struct device *dev, struct device_attribute *attr, ch
if (!rdev->rswitch)
goto out;
if (!rdev->rswitch)
goto out;
- for (i = 0; i < RIO_MAX_ROUTE_ENTRIES; i++) {
+ for (i = 0; i < RIO_MAX_ROUTE_ENTRIES(rdev->net->hport->sys_size);
+ i++) {
if (rdev->rswitch->route_table[i] == RIO_INVALID_ROUTE)
continue;
str +=
if (rdev->rswitch->route_table[i] == RIO_INVALID_ROUTE)
continue;
str +=
@@
-213,9
+214,11
@@
static struct bin_attribute rio_config_attr = {
*/
int rio_create_sysfs_dev_files(struct rio_dev *rdev)
{
*/
int rio_create_sysfs_dev_files(struct rio_dev *rdev)
{
-
sysfs_create_bin_file(&rdev->dev.kobj, &rio_config_attr)
;
+
int err = 0
;
- return 0;
+ err = sysfs_create_bin_file(&rdev->dev.kobj, &rio_config_attr);
+
+ return err;
}
/**
}
/**