diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-21 16:21:20 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-21 16:21:20 -0700 |
| commit | 29516d75a0b09e0a0328dd55c98a342515c9615a (patch) | |
| tree | 4b03326311958ad6de82653a1caf289ad8c38538 /fs/sysfs/file.c | |
| parent | 4ea78729b8dbfc400fe165a57b90a394a7275a54 (diff) | |
| parent | 4a4f8fdba6f5a34ca90f426021e17491a30202da (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'fs/sysfs/file.c')
| -rw-r--r-- | fs/sysfs/file.c | 6 |
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; |