Skip to content

Commit

Permalink
toshiba_acpi: Fix mis-merge
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Matthew Garrett committed Jun 1, 2012
1 parent d0e0a47 commit 53039f2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/platform/x86/toshiba_acpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 53039f2

Please sign in to comment.