toshiba_acpi: Fix mis-merge
authorMatthew Garrett <mjg@redhat.com>
Fri, 1 Jun 2012 15:02:36 +0000 (11:02 -0400)
committerMatthew Garrett <mjg@redhat.com>
Fri, 1 Jun 2012 15:02:36 +0000 (11:02 -0400)
commit53039f222c548bfc119eea6df4dca2b57550e271
tree2c9ee414243e8b47f9a0052e9325bc0a91d29246
parentd0e0a4777941b93036e5e325b0db6056e1c3092d
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>
drivers/platform/x86/toshiba_acpi.c