public inbox for kernel-janitors@vger.kernel.org
 help / color / mirror / Atom feed
* [patch] wmi: parse_wdg() should return kernel error codes
@ 2013-08-14  9:02 Dan Carpenter
  2013-09-03 12:14 ` Matthew Garrett
  0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2013-08-14  9:02 UTC (permalink / raw)
  To: Matthew Garrett; +Cc: platform-driver-x86, kernel-janitors

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>

diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index b13344c..f75ea69 100644
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -778,7 +778,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;
@@ -810,7 +810,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];

^ permalink raw reply related	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-09-03 12:14 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-14  9:02 [patch] wmi: parse_wdg() should return kernel error codes Dan Carpenter
2013-09-03 12:14 ` Matthew Garrett

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox