Merge branch 'upstream'

[linux-2.6-omap-h63xx.git] / fs / sysfs / bin.c

diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c
index d4aaa88d02144b4f6618d8f79dbd76aea6efe16a..c16a93c353c0cba3c7503b8041341be39ff69c21 100644 (file)
--- a/fs/sysfs/bin.c
+++ b/fs/sysfs/bin.c
@@ -25,7 +25,7 @@ fill_read(struct dentry *dentry, char *buffer, loff_t off, size_t count)
        struct kobject * kobj = to_kobj(dentry->d_parent);
 
        if (!attr->read)
-               return -EINVAL;
+               return -EIO;
 
        return attr->read(kobj, buffer, off, count);
 }
@@ -71,7 +71,7 @@ flush_write(struct dentry *dentry, char *buffer, loff_t offset, size_t count)
        struct kobject *kobj = to_kobj(dentry->d_parent);
 
        if (!attr->write)
-               return -EINVAL;
+               return -EIO;
 
        return attr->write(kobj, buffer, offset, count);
 }
@@ -163,7 +163,7 @@ static int release(struct inode * inode, struct file * file)
        return 0;
 }
 
-struct file_operations bin_fops = {
+const struct file_operations bin_fops = {
        .read           = read,
        .write          = write,
        .mmap           = mmap,