status = acpi_evaluate_object(handle, "_EJD", NULL, &buffer);
if (ACPI_SUCCESS(status)) {
obj = buffer.pointer;
- -- status = acpi_get_handle(NULL, obj->string.pointer, ejd);
+ ++ status = acpi_get_handle(ACPI_ROOT_OBJECT, obj->string.pointer,
+ ++ ejd);
kfree(buffer.pointer);
}
return status;
case ACPI_BUS_TYPE_DEVICE:
status = acpi_get_object_info(handle, &buffer);
if (ACPI_FAILURE(status)) {
--- printk(KERN_ERR PREFIX "%s: Error reading device info\n", __FUNCTION__);
+++ printk(KERN_ERR PREFIX "%s: Error reading device info\n", __func__);
return;
}
},
.driver_data = &quirk_acer_travelmate_2490,
},
+++ {
+++ .callback = dmi_matched,
+++ .ident = "Acer Aspire 3610",
+++ .matches = {
+++ DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+++ DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 3610"),
+++ },
+++ .driver_data = &quirk_acer_travelmate_2490,
+++ },
{
.callback = dmi_matched,
.ident = "Acer Aspire 5100",
},
.driver_data = &quirk_acer_travelmate_2490,
},
+++ {
+++ .callback = dmi_matched,
+++ .ident = "Acer Aspire 5610",
+++ .matches = {
+++ DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+++ DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5610"),
+++ },
+++ .driver_data = &quirk_acer_travelmate_2490,
+++ },
{
.callback = dmi_matched,
.ident = "Acer Aspire 5630",
},
.driver_data = &quirk_acer_travelmate_2490,
},
++ {
++ .callback = dmi_matched,
++ .ident = "Acer TravelMate 4200",
++ .matches = {
++ DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 4200"),
++ },
++ .driver_data = &quirk_acer_travelmate_2490,
++ },
{
.callback = dmi_matched,
.ident = "Medion MD 98300",
}
static struct led_classdev mail_led = {
--- .name = "acer-mail:green",
+++ .name = "acer-wmi::mail",
.brightness_set = mail_led_set,
};
---static int __init acer_led_init(struct device *dev)
+++static int __devinit acer_led_init(struct device *dev)
{
return led_classdev_register(dev, &mail_led);
}
.update_status = update_bl_status,
};
---static int __init acer_backlight_init(struct device *dev)
+++static int __devinit acer_backlight_init(struct device *dev)
{
struct backlight_device *bd;
return 0;
}
---static void __exit acer_backlight_exit(void)
+++static void acer_backlight_exit(void)
{
backlight_device_unregister(acer_backlight_device);
}
if (wmi_has_guid(WMID_GUID2) && interface) {
if (ACPI_FAILURE(WMID_set_capabilities())) {
--- printk(ACER_ERR "Unable to detect available devices\n");
+++ printk(ACER_ERR "Unable to detect available WMID "
+++ "devices\n");
return -ENODEV;
}
} else if (!wmi_has_guid(WMID_GUID2) && interface) {
--- printk(ACER_ERR "Unable to detect available devices\n");
+++ printk(ACER_ERR "No WMID device detection method found\n");
return -ENODEV;
}
interface = &AMW0_interface;
if (ACPI_FAILURE(AMW0_set_capabilities())) {
--- printk(ACER_ERR "Unable to detect available devices\n");
+++ printk(ACER_ERR "Unable to detect available AMW0 "
+++ "devices\n");
return -ENODEV;
}
}
--- if (wmi_has_guid(AMW0_GUID1)) {
--- if (ACPI_FAILURE(AMW0_find_mailled()))
--- printk(ACER_ERR "Unable to detect mail LED\n");
--- }
+++ if (wmi_has_guid(AMW0_GUID1))
+++ AMW0_find_mailled();
find_quirks();
if (!interface) {
--- printk(ACER_ERR "No or unsupported WMI interface, unable to ");
--- printk(KERN_CONT "load.\n");
+++ printk(ACER_ERR "No or unsupported WMI interface, unable to "
+++ "load\n");
return -ENODEV;
}