diff --git a/[refs] b/[refs] index ed8f5fd30c0f..365985826713 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d0e0a4777941b93036e5e325b0db6056e1c3092d +refs/heads/master: 53039f222c548bfc119eea6df4dca2b57550e271 diff --git a/trunk/drivers/platform/x86/toshiba_acpi.c b/trunk/drivers/platform/x86/toshiba_acpi.c index f88b9d22f39e..dab10f6edcd4 100644 --- a/trunk/drivers/platform/x86/toshiba_acpi.c +++ b/trunk/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)