Explorar o código

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>
Matthew Garrett %!s(int64=13) %!d(string=hai) anos
pai
achega
53039f222c
Modificáronse 1 ficheiros con 1 adicións e 1 borrados
  1. 1 1
      drivers/platform/x86/toshiba_acpi.c

+ 1 - 1
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)