diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 19:00:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 19:00:33 -0400 |
| commit | 1d345dac1f30af1cd9f3a1faa12f9f18f17f236e (patch) | |
| tree | 42a7deda7589edf704fe60dc262046755bd3f6a8 /drivers/block/deadline-iosched.c | |
| parent | fb395884576684ebb54b19b1054f4caed589d5f0 (diff) | |
| parent | 87c8a4433b608261a9becdb0ce2d2f2ed4b71d05 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'drivers/block/deadline-iosched.c')
| -rw-r--r-- | drivers/block/deadline-iosched.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/deadline-iosched.c b/drivers/block/deadline-iosched.c index d63d34c671f7..7f79f3dd0165 100644 --- a/drivers/block/deadline-iosched.c +++ b/drivers/block/deadline-iosched.c | |||
| @@ -886,7 +886,7 @@ deadline_attr_show(struct kobject *kobj, struct attribute *attr, char *page) | |||
| 886 | struct deadline_fs_entry *entry = to_deadline(attr); | 886 | struct deadline_fs_entry *entry = to_deadline(attr); |
| 887 | 887 | ||
| 888 | if (!entry->show) | 888 | if (!entry->show) |
| 889 | return 0; | 889 | return -EIO; |
| 890 | 890 | ||
| 891 | return entry->show(e->elevator_data, page); | 891 | return entry->show(e->elevator_data, page); |
| 892 | } | 892 | } |
| @@ -899,7 +899,7 @@ deadline_attr_store(struct kobject *kobj, struct attribute *attr, | |||
| 899 | struct deadline_fs_entry *entry = to_deadline(attr); | 899 | struct deadline_fs_entry *entry = to_deadline(attr); |
| 900 | 900 | ||
| 901 | if (!entry->store) | 901 | if (!entry->store) |
| 902 | return -EINVAL; | 902 | return -EIO; |
| 903 | 903 | ||
| 904 | return entry->store(e->elevator_data, page, length); | 904 | return entry->store(e->elevator_data, page, length); |
| 905 | } | 905 | } |