Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 3 insertions, 3 deletions

diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index 364208071e17..849aac115460 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -23,7 +23,7 @@ subsys_attr_show(struct kobject * kobj, struct attribute * attr, char * page)
 {
         struct subsystem * s = to_subsys(kobj);
         struct subsys_attribute * sattr = to_sattr(attr);
-        ssize_t ret = 0;
+        ssize_t ret = -EIO;
 
         if (sattr->show)
                 ret = sattr->show(s,page);
@@ -36,7 +36,7 @@ subsys_attr_store(struct kobject * kobj, struct attribute * attr,
 {
         struct subsystem * s = to_subsys(kobj);
         struct subsys_attribute * sattr = to_sattr(attr);
-        ssize_t ret = 0;
+        ssize_t ret = -EIO;
 
         if (sattr->store)
                 ret = sattr->store(s,page,count);
@@ -182,7 +182,7 @@ fill_write_buffer(struct sysfs_buffer * buffer, const char __user * buf, size_t
                 return -ENOMEM;
 
         if (count >= PAGE_SIZE)
-                count = PAGE_SIZE - 1;
+                count = PAGE_SIZE;
         error = copy_from_user(buffer->page,buf,count);
         buffer->needs_read_fill = 1;
         return error ? -EFAULT : count;