projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull bugzilla-9327 into release branch
[powerpc.git]
/
drivers
/
misc
/
asus-laptop.c
diff --git
a/drivers/misc/asus-laptop.c
b/drivers/misc/asus-laptop.c
index
d0fc4fd
..
7dce318
100644
(file)
--- a/
drivers/misc/asus-laptop.c
+++ b/
drivers/misc/asus-laptop.c
@@
-732,7
+732,7
@@
static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)
lcd_blank(FB_BLANK_POWERDOWN);
}
lcd_blank(FB_BLANK_POWERDOWN);
}
- acpi_bus_generate_event(hotk->device, event,
+ acpi_bus_generate_
proc_
event(hotk->device, event,
hotk->event_count[event % 128]++);
return;
hotk->event_count[event % 128]++);
return;
@@
-1072,7
+1072,8
@@
static void asus_backlight_exit(void)
}
#define ASUS_LED_UNREGISTER(object) \
}
#define ASUS_LED_UNREGISTER(object) \
- led_classdev_unregister(&object##_led)
+ if (object##_led.dev) \
+ led_classdev_unregister(&object##_led)
static void asus_led_exit(void)
{
static void asus_led_exit(void)
{