1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/platform/x86/hp_accel.c b/drivers/platform/x86/hp_accel.c
index 64b454855f65..22b2dfa73148 100644
--- a/drivers/platform/x86/hp_accel.c
+++ b/drivers/platform/x86/hp_accel.c
@@ -210,6 +210,8 @@ static struct dmi_system_id lis3lv02d_dmi_ids[] = {
         AXIS_DMI_MATCH("NC6715x", "HP Compaq 6715", y_inverted),
         AXIS_DMI_MATCH("NC693xx", "HP EliteBook 693", xy_rotated_right),
         AXIS_DMI_MATCH("NC693xx", "HP EliteBook 853", xy_swap),
+        AXIS_DMI_MATCH("NC854xx", "HP EliteBook 854", y_inverted),
+        AXIS_DMI_MATCH("NC273xx", "HP EliteBook 273", y_inverted),
         /* Intel-based HP Pavilion dv5 */
         AXIS_DMI_MATCH2("HPDV5_I",
                         PRODUCT_NAME, "HP Pavilion dv5",
@@ -228,6 +230,7 @@ static struct dmi_system_id lis3lv02d_dmi_ids[] = {
         AXIS_DMI_MATCH("HPB452x", "HP ProBook 452", y_inverted),
         AXIS_DMI_MATCH("HPB522x", "HP ProBook 522", xy_swap),
         AXIS_DMI_MATCH("HPB532x", "HP ProBook 532", y_inverted),
+        AXIS_DMI_MATCH("HPB655x", "HP ProBook 655", xy_swap_inverted),
         AXIS_DMI_MATCH("Mini510x", "HP Mini 510", xy_rotated_left_usd),
         AXIS_DMI_MATCH("HPB63xx", "HP ProBook 63", xy_swap),
         AXIS_DMI_MATCH("HPB64xx", "HP ProBook 64", xy_swap),
@@ -325,7 +328,7 @@ static int lis3lv02d_add(struct acpi_device *device)
         INIT_WORK(&hpled_led.work, delayed_set_status_worker);
         ret = led_classdev_register(NULL, &hpled_led.led_classdev);
         if (ret) {
-                lis3lv02d_joystick_disable();
+                lis3lv02d_joystick_disable(&lis3_dev);
                 lis3lv02d_poweroff(&lis3_dev);
                 flush_work(&hpled_led.work);
                 return ret;
@@ -339,7 +342,7 @@ static int lis3lv02d_remove(struct acpi_device *device, int type)
         if (!device)
                 return -EINVAL;
 
-        lis3lv02d_joystick_disable();
+        lis3lv02d_joystick_disable(&lis3_dev);
         lis3lv02d_poweroff(&lis3_dev);
 
         led_classdev_unregister(&hpled_led.led_classdev);
@@ -359,8 +362,7 @@ static int lis3lv02d_suspend(struct acpi_device *device, pm_message_t state)
 
 static int lis3lv02d_resume(struct acpi_device *device)
 {
-        lis3lv02d_poweron(&lis3_dev);
-        return 0;
+        return lis3lv02d_poweron(&lis3_dev);
 }
 #else
 #define lis3lv02d_suspend NULL