Skip to content

Commit 2a72c46

Browse files
kaixuxiakxjwrdegoede
authored andcommitted
platform/x86: toshiba_acpi: Fix the wrong variable assignment
The commit 78429e5 ("platform/x86: toshiba_acpi: Clean up variable declaration") cleans up variable declaration in video_proc_write(). Seems it does the variable assignment in the wrong place, this results in dead code and changes the source code logic. Fix it by doing the assignment at the beginning of the funciton. Fixes: 78429e5 ("platform/x86: toshiba_acpi: Clean up variable declaration") Reported-by: Tosk Robot <tencent_os_robot@tencent.com> Signed-off-by: Kaixu Xia <kaixuxia@tencent.com> Link: https://lore.kernel.org/r/1606024177-16481-1-git-send-email-kaixuxia@tencent.com Signed-off-by: Hans de Goede <hdegoede@redhat.com>
1 parent 9e7a005 commit 2a72c46

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

drivers/platform/x86/toshiba_acpi.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1478,7 +1478,7 @@ static ssize_t video_proc_write(struct file *file, const char __user *buf,
14781478
struct toshiba_acpi_dev *dev = PDE_DATA(file_inode(file));
14791479
char *buffer;
14801480
char *cmd;
1481-
int lcd_out, crt_out, tv_out;
1481+
int lcd_out = -1, crt_out = -1, tv_out = -1;
14821482
int remain = count;
14831483
int value;
14841484
int ret;
@@ -1510,7 +1510,6 @@ static ssize_t video_proc_write(struct file *file, const char __user *buf,
15101510

15111511
kfree(cmd);
15121512

1513-
lcd_out = crt_out = tv_out = -1;
15141513
ret = get_video_status(dev, &video_out);
15151514
if (!ret) {
15161515
unsigned int new_video_out = video_out;

0 commit comments

Comments
 (0)