Commit b2451e43 authored by Len Brown's avatar Len Brown

Pull fujitsu into release branch

parents 14f7d720 b023b43a
...@@ -122,9 +122,6 @@ static int get_lcd_level(void) ...@@ -122,9 +122,6 @@ static int get_lcd_level(void)
else else
fujitsu->brightness_changed = 0; fujitsu->brightness_changed = 0;
if (status < 0)
return status;
return fujitsu->brightness_level; return fujitsu->brightness_level;
} }
...@@ -198,7 +195,7 @@ static struct platform_driver fujitsupf_driver = { ...@@ -198,7 +195,7 @@ static struct platform_driver fujitsupf_driver = {
/* ACPI device */ /* ACPI device */
int acpi_fujitsu_add(struct acpi_device *device) static int acpi_fujitsu_add(struct acpi_device *device)
{ {
int result = 0; int result = 0;
int state = 0; int state = 0;
...@@ -229,7 +226,7 @@ int acpi_fujitsu_add(struct acpi_device *device) ...@@ -229,7 +226,7 @@ int acpi_fujitsu_add(struct acpi_device *device)
return result; return result;
} }
int acpi_fujitsu_remove(struct acpi_device *device, int type) static int acpi_fujitsu_remove(struct acpi_device *device, int type)
{ {
ACPI_FUNCTION_TRACE("acpi_fujitsu_remove"); ACPI_FUNCTION_TRACE("acpi_fujitsu_remove");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment