diff options
Diffstat (limited to 'drivers/leds')
-rw-r--r-- | drivers/leds/leds-da903x.c | 3 | ||||
-rw-r--r-- | drivers/leds/leds-hp-disk.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/leds/leds-da903x.c b/drivers/leds/leds-da903x.c index f1fddb18d70d..1f3cc512eff8 100644 --- a/drivers/leds/leds-da903x.c +++ b/drivers/leds/leds-da903x.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
18 | #include <linux/platform_device.h> | 18 | #include <linux/platform_device.h> |
19 | #include <linux/leds.h> | 19 | #include <linux/leds.h> |
20 | #include <linux/workqueue.h> | ||
20 | #include <linux/mfd/da903x.h> | 21 | #include <linux/mfd/da903x.h> |
21 | 22 | ||
22 | #define DA9030_LED1_CONTROL 0x20 | 23 | #define DA9030_LED1_CONTROL 0x20 |
@@ -57,7 +58,7 @@ static void da903x_led_work(struct work_struct *work) | |||
57 | offset = DA9030_LED_OFFSET(led->id); | 58 | offset = DA9030_LED_OFFSET(led->id); |
58 | val = led->flags & ~0x87; | 59 | val = led->flags & ~0x87; |
59 | val |= (led->new_brightness) ? 0x80 : 0; /* EN bit */ | 60 | val |= (led->new_brightness) ? 0x80 : 0; /* EN bit */ |
60 | val |= (led->new_brightness >> 5) & 0x7; /* PWM<2:0> */ | 61 | val |= (0x7 - (led->new_brightness >> 5)) & 0x7; /* PWM<2:0> */ |
61 | da903x_write(led->master, DA9030_LED1_CONTROL + offset, val); | 62 | da903x_write(led->master, DA9030_LED1_CONTROL + offset, val); |
62 | break; | 63 | break; |
63 | case DA9030_ID_VIBRA: | 64 | case DA9030_ID_VIBRA: |
diff --git a/drivers/leds/leds-hp-disk.c b/drivers/leds/leds-hp-disk.c index 53a25b1c2dae..44fa757d8254 100644 --- a/drivers/leds/leds-hp-disk.c +++ b/drivers/leds/leds-hp-disk.c | |||
@@ -27,7 +27,6 @@ | |||
27 | #include <linux/interrupt.h> | 27 | #include <linux/interrupt.h> |
28 | #include <linux/input.h> | 28 | #include <linux/input.h> |
29 | #include <linux/kthread.h> | 29 | #include <linux/kthread.h> |
30 | #include <linux/version.h> | ||
31 | #include <linux/leds.h> | 30 | #include <linux/leds.h> |
32 | #include <acpi/acpi_drivers.h> | 31 | #include <acpi/acpi_drivers.h> |
33 | 32 | ||
@@ -49,7 +48,7 @@ static struct acpi_hpled adev; | |||
49 | 48 | ||
50 | static acpi_status hpled_acpi_write(acpi_handle handle, int reg) | 49 | static acpi_status hpled_acpi_write(acpi_handle handle, int reg) |
51 | { | 50 | { |
52 | unsigned long ret; /* Not used when writing */ | 51 | unsigned long long ret; /* Not used when writing */ |
53 | union acpi_object in_obj[1]; | 52 | union acpi_object in_obj[1]; |
54 | struct acpi_object_list args = { 1, in_obj }; | 53 | struct acpi_object_list args = { 1, in_obj }; |
55 | 54 | ||