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 /kernel | |
| parent | fb395884576684ebb54b19b1054f4caed589d5f0 (diff) | |
| parent | 87c8a4433b608261a9becdb0ce2d2f2ed4b71d05 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/params.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/params.c b/kernel/params.c index 5513844bec..d586c35ef8 100644 --- a/kernel/params.c +++ b/kernel/params.c | |||
| @@ -629,7 +629,7 @@ static ssize_t module_attr_show(struct kobject *kobj, | |||
| 629 | mk = to_module_kobject(kobj); | 629 | mk = to_module_kobject(kobj); |
| 630 | 630 | ||
| 631 | if (!attribute->show) | 631 | if (!attribute->show) |
| 632 | return -EPERM; | 632 | return -EIO; |
| 633 | 633 | ||
| 634 | if (!try_module_get(mk->mod)) | 634 | if (!try_module_get(mk->mod)) |
| 635 | return -ENODEV; | 635 | return -ENODEV; |
| @@ -653,7 +653,7 @@ static ssize_t module_attr_store(struct kobject *kobj, | |||
| 653 | mk = to_module_kobject(kobj); | 653 | mk = to_module_kobject(kobj); |
| 654 | 654 | ||
| 655 | if (!attribute->store) | 655 | if (!attribute->store) |
| 656 | return -EPERM; | 656 | return -EIO; |
| 657 | 657 | ||
| 658 | if (!try_module_get(mk->mod)) | 658 | if (!try_module_get(mk->mod)) |
| 659 | return -ENODEV; | 659 | return -ENODEV; |