diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-21 19:21:20 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-21 19:21:20 -0400 |
| commit | 29516d75a0b09e0a0328dd55c98a342515c9615a (patch) | |
| tree | 4b03326311958ad6de82653a1caf289ad8c38538 /kernel | |
| parent | 4ea78729b8dbfc400fe165a57b90a394a7275a54 (diff) | |
| parent | 4a4f8fdba6f5a34ca90f426021e17491a30202da (diff) | |
Auto merge with /home/aegl/GIT/linus
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; |