diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-08-14 11:02:30 +0200 |
|---|---|---|
| committer | Matthew Garrett <matthew.garrett@nebula.com> | 2013-09-05 14:52:06 +0200 |
| commit | 0a018a68d3bfbd6288f3b646edb0dd0720209790 (patch) | |
| tree | 083659b980d4db0e5071cb86f54f0c7a15b2e43e /drivers/platform | |
| parent | hp_wmi: Fix unregister order in hp_wmi_rfkill_setup() (diff) | |
| download | linux-0a018a68d3bfbd6288f3b646edb0dd0720209790.tar.xz linux-0a018a68d3bfbd6288f3b646edb0dd0720209790.zip | |
wmi: parse_wdg() should return kernel error codes
The current code returns a mix of acpi_status and kernel error codes.
It should just return kernel error codes. There are already error paths
in this function which return -ENOMEM and that's what the caller
expects.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/wmi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c index 6e02c953d888..601ea9512242 100644 --- a/drivers/platform/x86/wmi.c +++ b/drivers/platform/x86/wmi.c @@ -780,7 +780,7 @@ static bool guid_already_parsed(const char *guid_string) /* * Parse the _WDG method for the GUID data blocks */ -static acpi_status parse_wdg(acpi_handle handle) +static int parse_wdg(acpi_handle handle) { struct acpi_buffer out = {ACPI_ALLOCATE_BUFFER, NULL}; union acpi_object *obj; @@ -812,7 +812,7 @@ static acpi_status parse_wdg(acpi_handle handle) wblock = kzalloc(sizeof(struct wmi_block), GFP_KERNEL); if (!wblock) - return AE_NO_MEMORY; + return -ENOMEM; wblock->handle = handle; wblock->gblock = gblock[i]; |