mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 09:50:04 +00:00
platform/x86: toshiba_acpi: Fix the wrong variable assignment
The commit78429e55e4
("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:78429e55e4
("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>
This commit is contained in:
parent
b970b732ff
commit
5af8be6b0c
1 changed files with 1 additions and 2 deletions
|
@ -1478,7 +1478,7 @@ static ssize_t video_proc_write(struct file *file, const char __user *buf,
|
|||
struct toshiba_acpi_dev *dev = PDE_DATA(file_inode(file));
|
||||
char *buffer;
|
||||
char *cmd;
|
||||
int lcd_out, crt_out, tv_out;
|
||||
int lcd_out = -1, crt_out = -1, tv_out = -1;
|
||||
int remain = count;
|
||||
int value;
|
||||
int ret;
|
||||
|
@ -1510,7 +1510,6 @@ static ssize_t video_proc_write(struct file *file, const char __user *buf,
|
|||
|
||||
kfree(cmd);
|
||||
|
||||
lcd_out = crt_out = tv_out = -1;
|
||||
ret = get_video_status(dev, &video_out);
|
||||
if (!ret) {
|
||||
unsigned int new_video_out = video_out;
|
||||
|
|
Loading…
Reference in a new issue