diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 21:52:42 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 21:52:42 -0400 |
| commit | b194b4250c2b7e9d762823ac6045316fcd4bf4f9 (patch) | |
| tree | 8c54b5004822958ef0a7603e76a4868582e26d7f /drivers/acpi/event.c | |
| parent | c4052da6f0c01a0b059d125d72bb934d0980b798 (diff) | |
| parent | 59a10b172fccaea793352c00fd9065f0a5b4ef70 (diff) | |
Merge branch 'upstream'
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 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, | |||
| 58 | return_VALUE(-EAGAIN); | 58 | return_VALUE(-EAGAIN); |
| 59 | 59 | ||
| 60 | result = acpi_bus_receive_event(&event); | 60 | result = acpi_bus_receive_event(&event); |
| 61 | if (result) { | 61 | if (result) |
| 62 | return_VALUE(-EIO); | 62 | return_VALUE(result); |
| 63 | } | ||
| 64 | 63 | ||
| 65 | chars_remaining = sprintf(str, "%s %s %08x %08x\n", | 64 | chars_remaining = sprintf(str, "%s %s %08x %08x\n", |
| 66 | event.device_class ? event. | 65 | event.device_class ? event. |