acer-wmi: setup accelerometer when appropriate acpi device was found
Subsystems (2)
PATCH 1/1 acer-wmi: setup accelerometer when appropriate acpi device was found
The 98d610c3739a patch was introduced since v4.11-rc1 that it causes that the accelerometer input device will not be created on workable machines because the HID string comparing logic is wrong.
And, the patch doesn't prevent that the accelerometer input device be created on the machines that have no BST0001. That's because the acpi_get_devices() returns success even it didn't find any match device.
This patch fixed the HID string comparing logic of BST0001 device. And, it also makes sure that the acpi_get_devices() returns acpi_handle for BST0001.
Reference: https://bugzilla.kernel.org/show_bug.cgi?id=193761
--- drivers/platform/x86/acer-wmi.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/platform/x86/acer-wmi.c +4 -5
@@ -1896,7 +1896,7 @@ static acpi_status __init acer_wmi_get_handle_cb(acpi_handle ah, u32 level,if (!strcmp (ctx,"SENR" )) {if (acpi_bus_get_device (ah, &dev))return AE_OK ; -if (!strcmp (ACER_WMID_ACCEL_HID ,acpi_device_hid (dev))) +if (strcmp (ACER_WMID_ACCEL_HID ,acpi_device_hid (dev)))return AE_OK ; }else return AE_OK ;
@@ -1917,8 +1917,7 @@ static int __init acer_wmi_get_handle(const char *name, const char *prop, handle =NULL ; status =acpi_get_devices (prop, acer_wmi_get_handle_cb, (void *)name, &handle); - -if (ACPI_SUCCESS (status)) { +if (ACPI_SUCCESS (status) && handle) { *ah = handle;return 0 ; }else {
@@ -2290,8 +2289,8 @@ static int __init acer_wmi_init(void)if (err)return err; err =acer_wmi_accel_setup (); -if (err) -return err; +if (err && err != -ENODEV ) +pr_warn ("Cannot enable accelerometer\n" ); } err =platform_driver_register (&acer_platform_driver);
Signature · 1 line
2.6.2
Quoted 4 lines · Chun-Yi
Fixes 98d610c3739a ("acer-wmi: setup accelerometer when machine has appropriate notify event")Reference: https://bugzilla.kernel.org/show_bug.cgi?id=193761
Reported-by Samuel Sieb <[email protected]>Signed-off-by "Lee, Chun-Yi" <[email protected]>
I have verified that this fixes the issue.
If you're going to include my name here, then please use my normal email address ([email protected]) instead of this one.
Quoted 4 lines · Chun-Yi
The
98d610c3739apatch was introduced since v4.11-rc1 that it causes that the accelerometer input device will not be created on workable machines because the HID string comparing logic is wrong.
Quoted 9 lines
And, the patch doesn't prevent that the accelerometer input device be created on the machines that have no BST0001. That's because the
acpi_get_devices()returns success even it didn't find any match device.This patch fixed the HID string comparing logic of BST0001 device. And, it also makes sure that the
acpi_get_devices()returnsacpi_handlefor BST0001.
Pushed to testing, thanks.
Quoted 45 lines
Fixes 98d610c3739a ("acer-wmi: setup accelerometer when machine has appropriate notify event")Reference: https://bugzilla.kernel.org/show_bug.cgi?id=193761
Reported-by Samuel Sieb <[email protected]>Signed-off-by "Lee, Chun-Yi" <[email protected]>--- drivers/platform/x86/acer-wmi.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)drivers/platform/x86/acer-wmi.c +4
-6@@ -1896,7 +1896,7 @@ static acpi_status __init acer_wmi_get_handle_cb(acpi_handle ah, u32 level,if (!strcmp (ctx,"SENR" )) {if (acpi_bus_get_device (ah, &dev))return AE_OK ; -if (!strcmp (ACER_WMID_ACCEL_HID ,acpi_device_hid (dev))) +if (strcmp (ACER_WMID_ACCEL_HID ,acpi_device_hid (dev)))return AE_OK ; }else return AE_OK ;@@ -1917,8 +1917,7 @@ static int __init acer_wmi_get_handle(const char *name, const char *prop, handle =NULL ; status =acpi_get_devices (prop, acer_wmi_get_handle_cb, (void *)name, &handle); - -if (ACPI_SUCCESS (status)) { +if (ACPI_SUCCESS (status) && handle) { *ah = handle;return 0 ; }else {@@ -2290,8 +2289,8 @@ static int __init acer_wmi_init(void)if (err)return err; err =acer_wmi_accel_setup (); -if (err) -return err; +if (err && err != -ENODEV ) +pr_warn ("Cannot enable accelerometer\n" ); } err =platform_driver_register (&acer_platform_driver); --2.6.2
Signature · 2 lines
With Best Regards, Andy Shevchenko