diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-31 20:46:07 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-31 20:46:07 -0400 |
commit | 094803e0aab3fe75bbf8202a8f4b5280eaade375 (patch) | |
tree | 278528ca9245a767fcfcfa97d977bd5714c082fd /drivers/platform/x86 | |
parent | 32087d4eeca14b82660dab288b1d659963b954bd (diff) | |
parent | d8805e633e054c816c47cb6e727c81f156d9253d (diff) |
Merge branch 'akpm' (Andrew's incoming)
Quoth Andrew:
- Most of MM. Still waiting for the poweroc guys to get off their
butts and review some threaded hugepages patches.
- alpha
- vfs bits
- drivers/misc
- a few core kerenl tweaks
- printk() features
- MAINTAINERS updates
- backlight merge
- leds merge
- various lib/ updates
- checkpatch updates
* akpm: (127 commits)
epoll: fix spurious lockdep warnings
checkpatch: add a --strict check for utf-8 in commit logs
kernel.h/checkpatch: mark strict_strto<foo> and simple_strto<foo> as obsolete
llist-return-whether-list-is-empty-before-adding-in-llist_add-fix
wireless: at76c50x: follow rename pack_hex_byte to hex_byte_pack
fat: follow rename pack_hex_byte() to hex_byte_pack()
security: follow rename pack_hex_byte() to hex_byte_pack()
kgdb: follow rename pack_hex_byte() to hex_byte_pack()
lib: rename pack_hex_byte() to hex_byte_pack()
lib/string.c: fix strim() semantics for strings that have only blanks
lib/idr.c: fix comment for ida_get_new_above()
lib/percpu_counter.c: enclose hotplug only variables in hotplug ifdef
lib/bitmap.c: quiet sparse noise about address space
lib/spinlock_debug.c: print owner on spinlock lockup
lib/kstrtox: common code between kstrto*() and simple_strto*() functions
drivers/leds/leds-lp5521.c: check if reset is successful
leds: turn the blink_timer off before starting to blink
leds: save the delay values after a successful call to blink_set()
drivers/leds/leds-gpio.c: use gpio_get_value_cansleep() when initializing
drivers/leds/leds-lm3530.c: add __devexit_p where needed
...
Diffstat (limited to 'drivers/platform/x86')
-rw-r--r-- | drivers/platform/x86/hp_accel.c | 10 |
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[] = { | |||
210 | AXIS_DMI_MATCH("NC6715x", "HP Compaq 6715", y_inverted), | 210 | AXIS_DMI_MATCH("NC6715x", "HP Compaq 6715", y_inverted), |
211 | AXIS_DMI_MATCH("NC693xx", "HP EliteBook 693", xy_rotated_right), | 211 | AXIS_DMI_MATCH("NC693xx", "HP EliteBook 693", xy_rotated_right), |
212 | AXIS_DMI_MATCH("NC693xx", "HP EliteBook 853", xy_swap), | 212 | AXIS_DMI_MATCH("NC693xx", "HP EliteBook 853", xy_swap), |
213 | AXIS_DMI_MATCH("NC854xx", "HP EliteBook 854", y_inverted), | ||
214 | AXIS_DMI_MATCH("NC273xx", "HP EliteBook 273", y_inverted), | ||
213 | /* Intel-based HP Pavilion dv5 */ | 215 | /* Intel-based HP Pavilion dv5 */ |
214 | AXIS_DMI_MATCH2("HPDV5_I", | 216 | AXIS_DMI_MATCH2("HPDV5_I", |
215 | PRODUCT_NAME, "HP Pavilion dv5", | 217 | PRODUCT_NAME, "HP Pavilion dv5", |
@@ -228,6 +230,7 @@ static struct dmi_system_id lis3lv02d_dmi_ids[] = { | |||
228 | AXIS_DMI_MATCH("HPB452x", "HP ProBook 452", y_inverted), | 230 | AXIS_DMI_MATCH("HPB452x", "HP ProBook 452", y_inverted), |
229 | AXIS_DMI_MATCH("HPB522x", "HP ProBook 522", xy_swap), | 231 | AXIS_DMI_MATCH("HPB522x", "HP ProBook 522", xy_swap), |
230 | AXIS_DMI_MATCH("HPB532x", "HP ProBook 532", y_inverted), | 232 | AXIS_DMI_MATCH("HPB532x", "HP ProBook 532", y_inverted), |
233 | AXIS_DMI_MATCH("HPB655x", "HP ProBook 655", xy_swap_inverted), | ||
231 | AXIS_DMI_MATCH("Mini510x", "HP Mini 510", xy_rotated_left_usd), | 234 | AXIS_DMI_MATCH("Mini510x", "HP Mini 510", xy_rotated_left_usd), |
232 | AXIS_DMI_MATCH("HPB63xx", "HP ProBook 63", xy_swap), | 235 | AXIS_DMI_MATCH("HPB63xx", "HP ProBook 63", xy_swap), |
233 | AXIS_DMI_MATCH("HPB64xx", "HP ProBook 64", xy_swap), | 236 | AXIS_DMI_MATCH("HPB64xx", "HP ProBook 64", xy_swap), |
@@ -325,7 +328,7 @@ static int lis3lv02d_add(struct acpi_device *device) | |||
325 | INIT_WORK(&hpled_led.work, delayed_set_status_worker); | 328 | INIT_WORK(&hpled_led.work, delayed_set_status_worker); |
326 | ret = led_classdev_register(NULL, &hpled_led.led_classdev); | 329 | ret = led_classdev_register(NULL, &hpled_led.led_classdev); |
327 | if (ret) { | 330 | if (ret) { |
328 | lis3lv02d_joystick_disable(); | 331 | lis3lv02d_joystick_disable(&lis3_dev); |
329 | lis3lv02d_poweroff(&lis3_dev); | 332 | lis3lv02d_poweroff(&lis3_dev); |
330 | flush_work(&hpled_led.work); | 333 | flush_work(&hpled_led.work); |
331 | return ret; | 334 | return ret; |
@@ -339,7 +342,7 @@ static int lis3lv02d_remove(struct acpi_device *device, int type) | |||
339 | if (!device) | 342 | if (!device) |
340 | return -EINVAL; | 343 | return -EINVAL; |
341 | 344 | ||
342 | lis3lv02d_joystick_disable(); | 345 | lis3lv02d_joystick_disable(&lis3_dev); |
343 | lis3lv02d_poweroff(&lis3_dev); | 346 | lis3lv02d_poweroff(&lis3_dev); |
344 | 347 | ||
345 | led_classdev_unregister(&hpled_led.led_classdev); | 348 | led_classdev_unregister(&hpled_led.led_classdev); |
@@ -359,8 +362,7 @@ static int lis3lv02d_suspend(struct acpi_device *device, pm_message_t state) | |||
359 | 362 | ||
360 | static int lis3lv02d_resume(struct acpi_device *device) | 363 | static int lis3lv02d_resume(struct acpi_device *device) |
361 | { | 364 | { |
362 | lis3lv02d_poweron(&lis3_dev); | 365 | return lis3lv02d_poweron(&lis3_dev); |
363 | return 0; | ||
364 | } | 366 | } |
365 | #else | 367 | #else |
366 | #define lis3lv02d_suspend NULL | 368 | #define lis3lv02d_suspend NULL |