Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ccf73bb authored by Len Brown's avatar Len Brown Committed by Linus Torvalds
Browse files

dell-wmi: sys_init_module: 'dell_wmi'->init suspiciously returned 21, it... 


dell-wmi: sys_init_module: 'dell_wmi'->init suspiciously returned 21, it should follow 0/-E convention

wmi_install_notify_handler() returns an acpi_error,
but dell_wmi_init() needs return a -errno style error.

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
Tested-by: default avatarPaul Rolland <rol@as2917.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b58454ec

drivers/platform/x86/dell-wmi.c

+5 −4
Original line number Original line Diff line number Diff line
@@ -323,6 +323,7 @@ static int __init dell_wmi_input_setup(void) 
static int __init dell_wmi_init(void)

static int __init dell_wmi_init(void)

{

{

	int err;

	int err;

	acpi_status status;





	if (wmi_has_guid(DELL_EVENT_GUID)) {

	if (wmi_has_guid(DELL_EVENT_GUID)) {

		printk(KERN_WARNING "dell-wmi: No known WMI GUID found\n");

		printk(KERN_WARNING "dell-wmi: No known WMI GUID found\n");
@@ -336,14 +337,14 @@ static int __init dell_wmi_init(void) 
	if (err)

	if (err)

		return err;

		return err;





	err = wmi_install_notify_handler(DELL_EVENT_GUID,

	status = wmi_install_notify_handler(DELL_EVENT_GUID,

					 dell_wmi_notify, NULL);

					 dell_wmi_notify, NULL);

	if (err) {

	if (ACPI_FAILURE(status)) {

		input_unregister_device(dell_wmi_input_dev);

		input_unregister_device(dell_wmi_input_dev);

		printk(KERN_ERR

		printk(KERN_ERR

			"dell-wmi: Unable to register notify handler - %d\n",

			"dell-wmi: Unable to register notify handler - %d\n",

			err);

			status);

		return err;

		return -ENODEV;

	}

	}





	return 0;

	return 0;