summaryrefslogtreecommitdiff
path: root/drivers/acpi/event.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-18 21:23:11 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-10-18 21:23:11 -0400
commit4e0e329d9a2011f9f7a7c0a378dc3bff7b0a0283 (patch)
treea802614e01460631c694dfa118642d54c3d5fc79 /drivers/acpi/event.c
parente33b9dfa3008fcaa908dc0c8c472a812c400f839 (diff)
parent59a10b172fccaea793352c00fd9065f0a5b4ef70 (diff)
downloadlinux-4e0e329d9a2011f9f7a7c0a378dc3bff7b0a0283.tar.gz
linux-4e0e329d9a2011f9f7a7c0a378dc3bff7b0a0283.tar.bz2
linux-4e0e329d9a2011f9f7a7c0a378dc3bff7b0a0283.zip
Merge branch 'upstream'
Diffstat (limited to 'drivers/acpi/event.c')
-rw-r--r--drivers/acpi/event.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c
index bfa8b76de403..2dbb1b0f11d5 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.