From 53039f222c548bfc119eea6df4dca2b57550e271 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Fri, 1 Jun 2012 11:02:36 -0400 Subject: [PATCH] toshiba_acpi: Fix mis-merge I managed to screw up the various backlight changes and ended up memsetting the props structure after it had already been populated. This should fix it. Signed-off-by: Matthew Garrett --- drivers/platform/x86/toshiba_acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c index f88b9d22f39e..dab10f6edcd4 100644 --- a/drivers/platform/x86/toshiba_acpi.c +++ b/drivers/platform/x86/toshiba_acpi.c @@ -1095,9 +1095,9 @@ static int __devinit toshiba_acpi_setup_backlight(struct toshiba_acpi_dev *dev) ret = get_tr_backlight_status(dev, &enabled); dev->tr_backlight_supported = !ret; + memset(&props, 0, sizeof(props)); props.type = BACKLIGHT_PLATFORM; props.max_brightness = HCI_LCD_BRIGHTNESS_LEVELS - 1; - memset(&props, 0, sizeof(props)); /* adding an extra level and having 0 change to transflective mode */ if (dev->tr_backlight_supported) -- 2.39.2