diff options
| author | Roland Dreier <rolandd@cisco.com> | 2005-10-24 10:55:29 -0700 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2005-10-24 10:55:29 -0700 |
| commit | ec329a135974f1c400214dab02f09584d4beeba9 (patch) | |
| tree | 235be754f76f4e7d51975d2434f226cfc75cdd08 /drivers/acpi/event.c | |
| parent | bbf207860931b6a033d0fbcd170ae2332c0d8216 (diff) | |
| parent | 5d7edb3c1a01310725d86f0d83fb3be45685dc82 (diff) | |
| download | kernel_samsung_smdk4412-ec329a135974f1c400214dab02f09584d4beeba9.zip kernel_samsung_smdk4412-ec329a135974f1c400214dab02f09584d4beeba9.tar.gz kernel_samsung_smdk4412-ec329a135974f1c400214dab02f09584d4beeba9.tar.bz2 | |
Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)
Diffstat (limited to 'drivers/acpi/event.c')
| -rw-r--r-- | drivers/acpi/event.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c index bfa8b76..2dbb1b0 100644 --- a/drivers/acpi/event.c +++ b/drivers/acpi/event.c @@ -58,9 +58,8 @@ acpi_system_read_event(struct file *file, char __user * buffer, size_t count, return_VALUE(-EAGAIN); result = acpi_bus_receive_event(&event); - if (result) { - return_VALUE(-EIO); - } + if (result) + return_VALUE(result); chars_remaining = sprintf(str, "%s %s %08x %08x\n", event.device_class ? event. |