|
@@ -108,7 +108,7 @@ static ssize_t sysfs_kf_read(struct kernfs_open_file *of, char *buf,
|
|
{
|
|
{
|
|
const struct sysfs_ops *ops = sysfs_file_ops(of->kn);
|
|
const struct sysfs_ops *ops = sysfs_file_ops(of->kn);
|
|
struct kobject *kobj = of->kn->parent->priv;
|
|
struct kobject *kobj = of->kn->parent->priv;
|
|
- size_t len;
|
|
|
|
|
|
+ ssize_t len;
|
|
|
|
|
|
/*
|
|
/*
|
|
* If buf != of->prealloc_buf, we don't know how
|
|
* If buf != of->prealloc_buf, we don't know how
|
|
@@ -117,13 +117,15 @@ static ssize_t sysfs_kf_read(struct kernfs_open_file *of, char *buf,
|
|
if (WARN_ON_ONCE(buf != of->prealloc_buf))
|
|
if (WARN_ON_ONCE(buf != of->prealloc_buf))
|
|
return 0;
|
|
return 0;
|
|
len = ops->show(kobj, of->kn->priv, buf);
|
|
len = ops->show(kobj, of->kn->priv, buf);
|
|
|
|
+ if (len < 0)
|
|
|
|
+ return len;
|
|
if (pos) {
|
|
if (pos) {
|
|
if (len <= pos)
|
|
if (len <= pos)
|
|
return 0;
|
|
return 0;
|
|
len -= pos;
|
|
len -= pos;
|
|
memmove(buf, buf + pos, len);
|
|
memmove(buf, buf + pos, len);
|
|
}
|
|
}
|
|
- return min(count, len);
|
|
|
|
|
|
+ return min_t(ssize_t, count, len);
|
|
}
|
|
}
|
|
|
|
|
|
/* kernfs write callback for regular sysfs files */
|
|
/* kernfs write callback for regular sysfs files */
|