summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthijs van Otterdijk <thotter@gmail.com>2007-01-06 03:37:03 +0300
committerLinus Torvalds <torvalds@woody.osdl.org>2007-01-06 10:55:29 +0300
commitc8af57eb76fbd70c7f5b421b065fd55d096e2bff (patch)
treecf4576b2810b1f00513aca76143d4786fc4fc4e5
parent73b8ed29ab3f6ad7204b4e61cfa87dc0c28d3019 (diff)
downloadlinux-sunxi-c8af57eb76fbd70c7f5b421b065fd55d096e2bff.tar.xz
[PATCH] fix the toshiba_acpi write_lcd return value
write_lcd() in toshiba_acpi returns 0 on success since the big ACPI patch merged in 2.6.20-rc2. It should return count. Signed-off-by: Matthijs van Otterdijk <thotter@gmail.com> Cc: Len Brown <lenb@kernel.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/acpi/toshiba_acpi.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/acpi/toshiba_acpi.c b/drivers/acpi/toshiba_acpi.c
index 88aeccbafaaf..d9b651ffcdc0 100644
--- a/drivers/acpi/toshiba_acpi.c
+++ b/drivers/acpi/toshiba_acpi.c
@@ -321,13 +321,16 @@ static int set_lcd_status(struct backlight_device *bd)
static unsigned long write_lcd(const char *buffer, unsigned long count)
{
int value;
- int ret = count;
+ int ret;
if (sscanf(buffer, " brightness : %i", &value) == 1 &&
- value >= 0 && value < HCI_LCD_BRIGHTNESS_LEVELS)
+ value >= 0 && value < HCI_LCD_BRIGHTNESS_LEVELS) {
ret = set_lcd(value);
- else
+ if (ret == 0)
+ ret = count;
+ } else {
ret = -EINVAL;
+ }
return ret;
}