summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMatthew Garrett <mjg@redhat.com>2012-06-01 11:02:36 -0400
committerMatthew Garrett <mjg@redhat.com>2012-06-01 11:02:36 -0400
commit53039f222c548bfc119eea6df4dca2b57550e271 (patch)
tree2c9ee414243e8b47f9a0052e9325bc0a91d29246 /drivers
parentd0e0a4777941b93036e5e325b0db6056e1c3092d (diff)
downloadlinux-53039f222c548bfc119eea6df4dca2b57550e271.tar.bz2
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 <mjg@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/platform/x86/toshiba_acpi.c2
1 files changed, 1 insertions, 1 deletions
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)