|
@@ -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 {
|
|
@@ -2287,8 +2286,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);
|